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

Change-Id: I29ba13c799f626b5cb1ae61471d76f0f7594fc7b