Merge cherrypicks of ['aosp/2392432'] into ndk-r25-release.

Change-Id: Ic32673085296e7e4885cd0863fcdbe084a8d81d1