Merge "iommu: msm: Move location of local iommu halt"