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

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