Merge "msm_xo: Work around RPM treating CXO_CLK and D0 as the same" into msm-3.0