Merge "iommu: arm-smmu: Fix a possible null pointer dereference" into msm-4.8