Merge "msm: acpuclock-krait: Clean up error paths in initialization code" into msm-3.4