Revert kk_2.7_rb1.41 merge conflicts in msm_vfe32.c

Introduced by 9f1fb4f40734c0de00155de5fa645484b972be46