Merge "msm: UIM driver msm_uim" into msm-3.4