Android and Mono build fixes