Added partial support for NDK r10