am 47b1e0b6: am b07d7f6c: Merge "Update NDK headers"

* commit '47b1e0b6f7b31c644b156baba12613dfbc7c740f':
  Update NDK headers