Revert change 'HIVE-7812: Disable CombineHiveInputFormat when ACID format is used' (Gunther Hagleitner)

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