Merge "Use HOST_CFLAGS more consistently"