Removed dependency to old NDK code for optimization.