am 5d884972: Merge "keystore: Add flag for blobs to be unencrypted" into jb-mr2-dev

* commit '5d884972cac7c20b6b1c9ad9148872b07c974e69':
  keystore: Add flag for blobs to be unencrypted
tree: ca864bd83df94149457b19959beb70b9b964e269
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/