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

Change-Id: I99b766a107127bbdd83e04b79a142f5f2e49aab6