Copy over updated NDK APIs and follow other API changes.

Change-Id: Ifec95268c9ade21963eea13357ec2f56fd7968c2
7 files changed