Merge "SurfaceFlinger: Correct extra parent scaling with buffer transforms." into oc-dev
am: 829a3e8b3d

Change-Id: I0b97c3703a64ad532da0c8400de3deac3195073e