[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 skip reason: Change-Id Iddd943c35084f7032a8e60273e5e63b59ad10d1c with SHA-1 882bbf33 is in history
Change-Id: Ia7c283172a90ed7b39c2332fab4b5d395954a76c