Snap for 8216814 from f6c30c1d40fd14734832b7929474867fa189b1a5 to ndk-r25-release

Change-Id: I6e3c6dfb9b03910f68b710f98d251a6c9455c38c