Merge "msm: qdsp5v2: Move away from the subsystem map apis" into msm-3.0