am 9ffe9be8: Merge "Fix the Vector erase bug"

* commit '9ffe9be8dd27def3f674da90cf9619437e3d428c':
  Fix the Vector erase bug
tree: 367618447e48160efc1333e0b54ec48a52610a26
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/