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

Change-Id: I4238434f8d580dc2a2459053e058988a217d5470