Snap for 8508678 from 7cea1fee975febe331912d905712249653aa2273 to ndk-r25-release

Change-Id: I68341246fa458802abfe74dba17df45f5f1e1ada