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

* commit '82bc1287714ca38e529e8f184bbe445febd60214':
  CTS: Fixes for android.hardware.cts.CameraTest#testCancelAutofocus