Merge "SurfaceFlinger: Inherit non-transform Scaling from parent." into oc-dev
am: 08260b881a

Change-Id: Ie65a136803007c3d8cde8e909f913399764de557