am 5f231a43: Merge "Fix win_sdk build by not using vector"

* commit '5f231a43b342fcfbd778d14f953b0b63715ee7f2':
  Fix win_sdk build by not using vector