Merge "msm: camera: Fix for high power issue in s5k4e1 actuator" into msm-3.0