HIVE-7523 - Fix spark build after merge merging trunk [Spark Branch]

git-svn-id: https://svn.apache.org/repos/asf/hive/branches/spark@1613742 13f79535-47bb-0310-9956-ffa450edef68