Upgrade to APR(*) 1.6.x and work around Xcode12 over-agressive clang warning/errors (cherry picked from commit b1dc36c01638ed0d08b23f216ee4fa310c82a82b)