am 4bad2d21: Merge "Add more support for GLOBAL_CONLYFLAGS."

* commit '4bad2d2156bcb589c2d1bb223a074edc39aa428c':
  Add more support for GLOBAL_CONLYFLAGS.