Upgrade to NDK r10