Merge "Move sh_vendor cflags to its own target"