QCameraHWI_Parm: setPreviewFrameRate: update from mako
QCameraHWI_Still: initSnapshotBuffers: fix merge fail