Merge "msm: camera: Acutuator and flash control" into msm-3.0