am 349d7453: am 98b2c359: Copy over updated NDK APIs and follow other API changes.

Merge commit '349d7453088fb63fd786fb1f49f7cf0707329319'

* commit '349d7453088fb63fd786fb1f49f7cf0707329319':
  Copy over updated NDK APIs and follow other API changes.