Merge "keystore: replace VLA with vector" am: 9c6612e264
am: 451f205ba2

Change-Id: I29ba13c799f626b5cb1ae61471d76f0f7594fc7b
tree: addc9450a15a15ac5d044a5a9b660b059af74afa
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE