Merge "Move gradle warpper for BasicAndroidKeyStore" into jb-mr2-dev