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

Change-Id: Ief3ad61ef08e5cdcbdd158cad45fcd801422c2e8