Merge "msm: camera: fd: add flush functionality" into dev/msm-4.9-camx