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

Change-Id: Ic5df52da0735de1166336a85404573e1002de2b0