am 73524561: Merge "CTS: Fixes for android.hardware.cts.CameraTest#testPreviewCallback" into gingerbread

* commit '7352456161866d781f74af633c97bf8bf166ead1':
  CTS: Fixes for android.hardware.cts.CameraTest#testPreviewCallback