Fix Android tests after renaming codegen tests with Java
Buildserver auto merge