am f24ee2bb: Merge "Removed unused variables"

* commit 'f24ee2bb983a1646a058d8c816411d1a83fa2672':
  Removed unused variables
tree: 2dd02ffd9cddd024c7f25aefc7eb193442e18f1e
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/