Merge "arm-smmu: Fix incorrect memset argument order" into msm-4.9