Android NDK r23 Beta 5 (build 7421159)
Snap for 7336629 from 60fa7427a8b8b1fe992ceff04fee0c781c5f4725 to ndk-r23-release

Change-Id: If0f6e5613c86316c55e1ad83e1d554c5c821f2a0