Merge "iommu/arm-smmu: Wire up generic configuration support" into msm-4.8