Merge "surfaceflinger: Pass proper transform orientation to setProjection()"