am 1cee95d5: Merge "Allow entropy to be provided to some operations"

* commit '1cee95d56478ad43b32c8c96119825ea358550e8':
  Allow entropy to be provided to some operations
tree: cee955b337ca93331f7c8f532eff741c40b4674b
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/