Merge "Revert "msm: pil: Migrate to SMP2P framework from SMSM mechanism.""