Drop buildbottouch again; the master is using "make touch" now.
Drop buildbottouch again; the master is using "make touch" now.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator