Merge "video: msm: Migrate away from subsystem map APIs" into msm-3.0