Updates and cleanup for building on Android.