Merge "msm: msm_xo: Set the correct bits for XO_CORE on 8660" into msm-3.0