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

Change-Id: I4166bbfdf23e37e5b77fccc80dd7d09698014a3c