Merge "defconfig: Enable ion for 7627a/8625" into msm-3.4