Merge "Add more support for GLOBAL_CONLYFLAGS."