Merge "msm8660-defconfig: Disable IOMMU on 8660" into msm-3.4