Merge "iommu/arm-smmu: Support v7s context format" into msm-4.8