am b8e1cdda: am 7ae589ca: Merge "ndk: minor header update"

* commit 'b8e1cdda80fb3aee075e3633c7c0818e21e33ea9':
  ndk: minor header update