Merge "Replace most usages of utils/Vector.h"