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

* commit '674617f357b5d4b8f1254cb6765078cb22fd947a':
  Fix CTS verifier camera orientation test.