am 93668489: (-s ours) am 1919835e: am f508166b: Merge "Fix C++ reflection of vector types."

* commit '9366848924653f9c7b9046a5a6ebf1e6f4dc4846':