crypto: msm: backport updates from CAF msm-3.4