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

* commit 'a7700b7300b4c136c34ecdacfe6bd581357ede88':
tree: 367618447e48160efc1333e0b54ec48a52610a26
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/