Merge "Prevent changes to COMMON_GLOBAL_C(PP)FLAGS"