Merge "Removed unused variables"
tree: 2dd02ffd9cddd024c7f25aefc7eb193442e18f1e
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/