More Android build fixes.