am 8b51475c: Revert "Remove AndroidKeyStore from API"

* commit '8b51475c97f8f2742047976283afbe1f9ef9fcbf':
  Revert "Remove AndroidKeyStore from API"