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

* commit 'cba5b80228c9c3c39c6b5efd212f31b1c9e8ac53':