Merge "Revert "msm: 8625: Remove static mapping for second core"" into msm-3.0