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

Change-Id: I51692096bfc6020c2038c42eedb19439704a6483