Android NDK r25b (8937393)
Snap for 8508678 from ab19bc5b97685cab637f22f645e9fc156151a7fa to ndk-r25-release

Change-Id: I6634645995cb955d0f3d2bcadf18edb9bcd79267