Revert 1520753 and 1520752 as they are not fixing the javahl build on the centos bot

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