Merge "Add optional additional entropy to finish" into mnc-dev
tree: d7e5f9f7437e5d7598348fd491682649e118e619
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/