Merge change 8501 into donut

* changes:
  Handle LOCAL_CPPFLAGS/CFLAGS/CXXFLAGS as claimed by the documentation.