This reverts commit cdd96909, which
broke gerrit_unittest.py within the chroot, which has Java 6.

Original-Review URL: https://codereview.chromium.org/164023005

TBR=szager
BUG=344786
TEST=Run the unit tests before and after. Confirm this CL fixes them.

Review URL: https://codereview.chromium.org/170423003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@251976 0039d316-1c4b-4281-b951-d872f2087c98