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

* commit '628c43ab55a86fe9c7e77eb6fa33cedce80a94d4':
  Use Supported Camera resolution.