Merge "platform: msm_shared: Change crypto init & clean up calls."