am 7d211c09: Merge "Add -Wunused to keystore"

* commit '7d211c094b3124d0646b6397da679c708d4e1b08':
  Add -Wunused to keystore