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

Change-Id: Id9d77bacfb62708f120e6c42afada2f3e08693ac