Merge "msm: platsmp-8625: refactor code for core_reset_base"