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

Change-Id: I64530eac3174116212c8ddfd0bf3c713b0c95bcf