Snap for 7333099 from 3271a3519dc746c8f49e474ef7b3be2ce2fb29da to ndk-release-r23

Change-Id: Ie8460238c285eb77f53e3c7d0af6e0b0f9bcfbec