Android NDK r23c (8568313)
Merge cherrypicks of [2071714] into ndk-release-r23.

Change-Id: Ic6039c2884e746179dae9a44ef6509956e630b3e