Merge "iommu/arm-smmu: Work around ARM DMA configuration" into msm-4.8