Merge "msm: fix circular dependency warning when ENABLE_DMM is set" into msm-3.0