Merge "Set flags correctly for softkeymaster."
tree: 274e763c2e8b29963623f4b5c24e554a68766be8
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/