Android NDK r26d (11579264)
Merge cherrypicks of ['android-review.googlesource.com/2926057'] into ndk-r26-release.

Change-Id: Idef67c3fb469093e43200b63e81b950fe68082b1