Changes for Android, building via eshell, etc.