Merge "Remove TARGET_GLOBAL_CFLAGS use"