am e8c0bd07: Merge change 8501 into donut

Merge commit 'e8c0bd070c2d7d3987f188b520b36cbdfa22399b'

* commit 'e8c0bd070c2d7d3987f188b520b36cbdfa22399b':
  Handle LOCAL_CPPFLAGS/CFLAGS/CXXFLAGS as claimed by the documentation.