On 1.7.x branch: Merge 1.7.x-cmake-improvements branch.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1917283 13f79535-47bb-0310-9956-ffa450edef68