Tweaks for Android build.