am 8c093d5d: Merge change 2085 into donut

Merge commit '8c093d5d2a6695cda888827a506633da922ad543'

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