am e2a23438: Merge "Improve the usability of CTS Verifier "Camera Formats"" into kitkat-cts-dev automerge: f54af35  -s ours

* commit 'e2a23438c4986d688b0e1382329a74deff0c39d4':