Revert "buildfailed time is too long for me"

This reverts commit 64b5c68a0810dea38c580fafe13bec6988c38e3a.

Conflicts:
	envsetup.sh