am 76879423: am f0a26e83: am 82bc1287: Merge "CTS: Fixes for android.hardware.cts.CameraTest#testCancelAutofocus" into gingerbread

* commit '7687942310f2ec4a217ffcc5807925086bdeb8b6':
  CTS: Fixes for android.hardware.cts.CameraTest#testCancelAutofocus