git merge crypto from codeaurora