Merge "msm: Remove subsystem map api files"