Merge "msm: 8660: Select Ion multimedia support for 8660" into msm-3.0