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

Change-Id: Ic914fc198e9dc80b0493797ffc9f889f99d00928