Merge "crypto: msm: Fix compilation errors of qcrypto driver" into msm-4.9