Merge "iommu: arm-smmu: reverse order of bus/gdsc enable" into msm-4.9