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

Change-Id: I379eafd46e2c81d478848e85ea119212dfee7a5e