I20200322-1150
This reverts commit b9e2d5050fed6a8bf3b5eee38f63b69554224235. Remote ant classes are compiled with Java 6, and commit above broke that. Change-Id: I3efab91fdde29d1c59f34f1cdba210185093d1a0
This reverts commit b9e2d5050fed6a8bf3b5eee38f63b69554224235. Remote ant classes are compiled with Java 6, and commit above broke that. Change-Id: I3efab91fdde29d1c59f34f1cdba210185093d1a0