Merge change 5637 into donut

* changes:
  Add support for LOCAL_C_INCLUDES in Android.mk, to better match the Android build system.