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

Change-Id: Ib7d0d8f70124a61ff65e3bf83539afe52c3c5b86