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

Change-Id: I206125780e2bd49e973aa615d88621453b461620