Merge "iommu/iommu-debug: Move attachment info file to subdirectory" into msm-4.8