Fixes for the Android build with the latest NDK.