Merge "msm8960: Use ion for multimedia devices" into msm-3.0