TEZ-1466. Fix JDK8 builds of Tez (gopalv)