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

* commit '2b7aeaf07787e414ad2af93bd88baee47b727000':
  NDK: Last cleanup of the platform headers