am 186ce6d5: Merge "NDK: Last cleanup of the platform headers" into gingerbread

* commit '186ce6d54380d2808acf341aec676f9c5ec56b63':
  NDK: Last cleanup of the platform headers