Merge the APR-Util portion of r1523479 from trunk:

testpass doesn't use assert(), so don't include <assert.h>.


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