Merge "Camera: Fix high speed recording failure due to prepare()" am: 0de0bf9db7 am: 6808238a51
am: 6ff79a0dd1

Change-Id: I2d6d71f6e145441b69c016dc7bf8f5403453ddce