Merge "Move sh_vendor cflags to its own target"
am: f74f8d48e2

Change-Id: Idbfe973bc99c3afaabf9e36d5be2607c352d2287