Merge "keystore: replace VLA with vector"