Android NDK r23 Beta 4 (build 7344513)
Snap for 7336629 from 849be7280ed95e644c13161c5100c89eee953958 to ndk-r23-release

Change-Id: Icb45ef17f9bd93538bc9805698b128f0f529f5c9