Merge cherrypicks of ['android-review.googlesource.com/2697497'] into ndk-r26-release.

Change-Id: I03a553e76c3bdf02a17c1852e4c6688b97325870