Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread