Fixes for NDK r5e new 64-bit toolchain