Merge "surfaceflinger: Pass proper transform orientation to setProjection()" am: ac5b759433
am: 0883f45f03

Change-Id: I57e174e5e5bec9251faf99e8cd040ab2aeb8f9b7