Merge "msm: smd: stub out legacy macros" into msm-3.0