am 19c6555d: Merge "Update NDK\'s android headers"

* commit '19c6555d9deed3fb77ac2a76b2861e49542533c9':
  Update NDK's android headers