Disable codegen test on Android

Can't import from enum there because a package directive is appended to the
beginning of the file in Android tests, invalidating import statements
Drop temporary hack, enums are comparable now
Buildserver auto merge