Merge "msm: 8660: include msm-specific ion header" into msm-3.4