Merge "Fix C++ reflection of vector types."