TEZ-76. Fix build break due to YARN-577 and MAPREDUCE-5181/YARN-579. (hitesh)

git-svn-id: https://svn.apache.org/repos/asf/incubator/tez/branches/TEZ-1@1475886 13f79535-47bb-0310-9956-ffa450edef68