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

Change-Id: I80b7925c568932356fa332611fca98b64ce034a0