am 79de3186: am e954f691: am d6e0ed1c: Merge "Fix CTS verifier camera orientation test." into kitkat-cts-dev automerge: 674617f

* commit '79de318606b9073570bd62b5c8dea43a8f3cc52b':