Android NDK r23 (7599858)
Snap for 7478747 from 6fc591c88cd19bf71e1f638ccc4a4b5e06592aff to ndk-release-r23

Change-Id: I4df3bac418abf7c0e45a986450264f18e645d736