Fixed evs problem in android teambuilder