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

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