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

Change-Id: I4c40021227fb1d539bbc3c2516a55b0c121dac4e