Merge "Comment out unused parameter."
tree: dd06252ea4921d939b37298c9fe2c71c3e32589c
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/