First round of build fixes for Android.