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

Change-Id: Id8d7c292409c83bc6c6fa578da90ad44f5af6708