Merge "AndroidKeyStore: add Builder for param spec"