Merge changes from aosp/ndk.

Change-Id: I200306530a2672950d91e8782012cfb4b58cbb2e