[automerger skipped] Swap video frame rotation direction. am: a1642fee -s...

[automerger skipped] Swap video frame rotation direction. am: a1642fee -s ours am: 5fad64e0 -s ours am: 2dfeace6 -s ours am: c3f309b6 -s ours am: e4cc4c2e -s ours
am skip reason: Change-Id Iddd943c35084f7032a8e60273e5e63b59ad10d1c with SHA-1 882bbf33 is in history

Change-Id: I242e71d4ba029140e2615d9b17190cde044712b3