Merge change 8622 into donut

* changes:
  Fix LOCAL_CFLAGS/CPPFLAGS handling to match full Android build system.