Snap for 8216814 from c5825b21d775fb75fac5e5775aed56e137b6872b to ndk-r25-release

Change-Id: Ib6584dc806703d0c9ee542235d05ca19e02e89c8