am c6b61b3c: Merge "Correct the order of expected and actual values in CameraTest." into gingerbread

Merge commit 'c6b61b3ce45e0724275b27d479abb2cff6d7683c' into gingerbread-plus-aosp

* commit 'c6b61b3ce45e0724275b27d479abb2cff6d7683c':
  Correct the order of expected and actual values in CameraTest.