Merge "keystore: replace VLA with vector"
Treehugger Robot authored
9c6612e2