Merge "crypto: remove redundant CRYPTO_CONFIG setting" into msm-3.0