Android NDK r25 (8775105)
Snap for 8508678 from 8b1889b14c73a5a5e691c96110b661ea34227140 to ndk-r25-release

Change-Id: I1d87498e88f223bdad7c23ce54c1baa63a22fc76