am f508166b: Merge "Fix C++ reflection of vector types."

* commit 'f508166bad4854543b9437cc6d3e4d34a883ec41':
  Fix C++ reflection of vector types.