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