am 3b8021da: am 56cba306: am 1cee95d5: Merge "Allow entropy to be provided to some operations"

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