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

* commit '7ae589ca49c8a37f52712101476c6cd664cc7e08':
  ndk: minor header update