am e7f9da44: Merge "Clear out ENGINE flags when initializing"

* commit 'e7f9da44646b8eb66ef2e7b163176b5272216e86':
  Clear out ENGINE flags when initializing
tree: bf1f6d0fc9f8ed4cd1f24b19da071d608f83801a
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/