am eb09a40f: am 37a6cee6: Update camera test due to API change.

Merge commit 'eb09a40f05d8b45e7d0813383b27e42ccc9ee647'

* commit 'eb09a40f05d8b45e7d0813383b27e42ccc9ee647':
  Update camera test due to API change.