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