Fix running of various Android tests