Merge "Fix CTS verifier camera orientation test." into kitkat-cts-dev