Snap for 8518779 from ef07f544e30797ceea64da4fba8891ad4bbe6234 to ndk-r25-release

Change-Id: Ibd80cc9d7869a332c58a8064d54b9b493f3e83cb