Merge change 5635 into donut

* changes:
  Fix several typos in the NDK build system that caused quite a few bugs: