am d30325ba: (-s ours) am 5ae973dd: am 629b4376: Merge "Remove incorrect return value read"

* commit 'd30325ba99db9dfb22fc03954e40deda1e35cd6d':
  Remove incorrect return value read
tree: f136568de40380f2fa0931b1478c683ca5141425
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/