am 3ff1216c: Merge "Fix CTS verifier camera orientation test." into kitkat-cts-dev automerge: 674617f automerge: d6e0ed1

* commit '3ff1216c3e6e33fdd7f31051463d997c5f7da368':
  Fix CTS verifier camera orientation test.