HIVE-8758: Fix hadoop-1 build [Spark Branch] (Jimmy via Xuefu)

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1637790 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'upstream/spark' into spark
Merge remote branch 'origin/spark' into HIVE-8542