Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a  -s ours
automerge: dbdeb0f

* commit 'dbdeb0fb2a0085f81957164c56b77aaaaaf28823':
  Use Supported Camera resolution.