[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: 017f8fc2 -s ours am: 98fd3969 -s ours am: 62f92d32 -s ours am: 89d975fc -s ours
am skip reason: Change-Id Iddd943c35084f7032a8e60273e5e63b59ad10d1c with SHA-1 a1642fee is in history

Change-Id: I69b7f0426a581163216915dd598270d550f1a117