Fix Android tests
Buildserver auto merge