git merge drivers/crypto from codeaurora