Merge change 2085 into donut

* changes:
  This fixes the build to always define the ANDROID macro, and remove an empty -I from the compiler options.