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

Change-Id: I71ab6820023206666cf37c2274c5fde05a1e5a0f