am 48c45fec: am f24ee2bb: Merge "Removed unused variables"

* commit '48c45fec70722c0afd9af7e98b868bd0aa952ec8':
  Removed unused variables
tree: 5ccbc4b691bbcc547dd30a978019064943e325a4
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/