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

* commit '25282774247e841d6d5a3ba903f49866666119b2':
  Fix win_sdk build by not using vector