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

* commit '84bd1184b9cf80cd4bf76fcf650f8de8ca35aca5':
  ndk: minor header update