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

* commit 'd6e0ed1c085bdb0bc5c8d51d4f0f5a3ebf7fc074':
  Fix CTS verifier camera orientation test.