Merge "msm: camera: 8960: Unify Autofocus actuator" into msm-3.0