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

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