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

Change-Id: I11f2d5f210a0fc83d7e5bed3c89bcaa9bc639899