am 29c2df0d: am 905e6d01: am ed6f33fd: Merge "Move gradle warpper for BasicAndroidKeyStore" into jb-mr2-dev

* commit '29c2df0db7c6141ab22750d5fc225ad15a9d4ca2':
  Move gradle warpper for BasicAndroidKeyStore