Re-adding NDK_VERSION