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

* commit '4967c3e7c479198c5f822daf32e660c3c0325c6c':
  Use Supported Camera resolution.