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

* commit 'f54af35cfc42cfb9efe871574f9a277f9a5f799f':
  Improve the usability of CTS Verifier "Camera Formats"