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

Change-Id: I2147b9d6c9e77bc985f7352c3ab02b7edd997eb5