Merge cherrypicks of ['android-review.googlesource.com/3051002', 'android-review.googlesource.com/3051003', 'android-review.googlesource.com/3054184', 'android-review.googlesource.com/3104758', 'android-review.googlesource.com/3104759'] into ndk-r27-release.

Change-Id: I08eaf518c502d6d11506b83290b407a1060102f2