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

Change-Id: I883e1fb3a60cdcf1c8ea6a4468edd895dfe3b797