am 90fc9799: Merge change 5635 into donut

Merge commit '90fc97997727e094f07921486072090d33025d5b'

* commit '90fc97997727e094f07921486072090d33025d5b':
  Fix several typos in the NDK build system that caused quite a few bugs: