Android build fixes