Support Android ndk versions r23-beta3
and up
#85806
+17
−4
Merged