Fix build issues on Android

(formerly torbutton) master doesn't build on Android, we need to fix those issues.

Edited by morgan