Merge "msm: smd: convert to secured smem feature"