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

Merge commit '37a6cee614e7654b44b00ced591d4ce4d283fb17' into gingerbread-plus-aosp

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