Merge "Prevent changes to COMMON_GLOBAL_C(PP)FLAGS"
am: d443abf1aa

* commit 'd443abf1aaa12c1b0fb82c940df60046c06aaed7':
  Prevent changes to COMMON_GLOBAL_C(PP)FLAGS