Merge "msm: acpuclock-8960: Support booting with fewer CPUs" into msm-3.4