Add Android compat logging
Fix desktop builds