Merge "Factor vector unary/binary shared code out into superclass." am: 2d4d161f26
am: fc5558cacf

Change-Id: I66c66a79cacf7a69a5609b696bcd31eff7c0cb15