am e89ebc76: am ce7f2723: Merge "AndroidKeyStore: add Builder for param spec"

* commit 'e89ebc767e554415d5ead323bb48012f15760046':
  AndroidKeyStore: add Builder for param spec