Remove the extra steps in the NDK build process