Snap for 8518779 from 465ef8fe75f632361e799dc9f7c644daf1e343f5 to ndk-r25-release

Change-Id: I2f63e1b8c04d2d8d61721e2815dc309429fdf715