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

* commit '905e6d010eb113b397c96470fb9e913c3125c3ad':
  Move gradle warpper for BasicAndroidKeyStore