[android] upgrade to NDK r12b

platform/android/scripts/configure.sh

@@ -10,7 +10,7 @@ ZLIB_VERSION=system
 NUNICODE_VERSION=1.6
 LIBZIP_VERSION=0.11.2
 GEOMETRY_VERSION=0.5.0
-GEOJSONVT_VERSION=4.1.2
+GEOJSONVT_VERSION=4.1.2-cxx11abi
 VARIANT_VERSION=1.1.0
 RAPIDJSON_VERSION=1.0.2
 JNI_HPP_VERSION=2.0.0

platform/android/scripts/debug.sh

@@ -11,7 +11,7 @@ export PATH="${MASON_DIR}:${PATH}"
 export MASON_ANDROID_ABI=x86
 export MASON_ANDROID_ARCH=x86
 export MASON_ANDROID_PLATFORM=9
-export MASON_NDK_PACKAGE_VERSION=${MASON_ANDROID_ARCH}-${MASON_ANDROID_PLATFORM}-r10e
+export MASON_NDK_PACKAGE_VERSION=${MASON_ANDROID_ARCH}-${MASON_ANDROID_PLATFORM}-r12b
 
 if [[ $1 == '--prepare' ]]; then
   mkdir -p ~/.android/debugging/{vendor,system}_lib

src/mbgl/util/math.cpp

@@ -24,7 +24,7 @@ uint32_t ceil_log2(uint64_t x) {
 double log2(double x) {
 // log2() is producing wrong results on ARMv5 binaries
 // running on ARMv7+ CPUs.
-#if defined(__ANDROID__) && defined(__ARM_ARCH_5TE__)
+#if defined(__ANDROID__)
     return std::log(x) / 0.6931471805599453; // log(x) / log(2)
 #else
     return ::log2(x);