am 622a5dd6: Merge "Fixing race in android.hardware.cts.CameraTest#testZoom" into gingerbread

* commit '622a5dd642cb734bae6ff78d3084c08939791e9d':
  Fixing race in android.hardware.cts.CameraTest#testZoom