Merge "[SurfaceFlinger] Fix screenshot orientation in landscape" into qt-dev am: feb6af0eaf
am: 56d8b6252c

Change-Id: Ic412e24496c2ed54d0904ecb94aef0e6dd5173ee