Merge "Fixing race in android.hardware.cts.CameraTest#testZoom" into gingerbread