Merge "update auxvec.h from upstream."