Merge "msm_shared: rules.mk: enable msmplutonium compilation"