Android NDK r25c (9519653)
Merge cherrypicks of ['aosp/2213721', 'aosp/2213722'] into ndk-r25-release.

Change-Id: Ieb49d4f195f2b7f61310b057597c8b069a48ae48