am f1b2c348: am 8b51475c: Revert "Remove AndroidKeyStore from API"

* commit 'f1b2c34819ff65ba14af5eb4eeba06196ee978d3':
  Revert "Remove AndroidKeyStore from API"