Fix NDK build errors