Merge "SurfaceFlinger: Fixes around rotation and cropping." into pi-dev
am: 855087f3f1

Change-Id: Ic7aa9c5a4a021cece8d112e99d0367c7a4e85dd8