Fix apr and conform both apr/libapr projects to trunk/1.5


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