Android O IOT Preview 6 (4475743)
Merge "Move sh_vendor cflags to its own target"