Merge "soc: qcom: msm-core: Fix mpidr masking" into msm-4.9