Fix Android build with the most resent android.toolchain.cmake