Bring in upstream hwloc SVN r4319.

This commit was SVN r25987.

The following SVN revisions from the original message are invalid or
inconsistent and therefore were not cross-referenced:
  r4319

opal/mca/hwloc/hwloc132/README-ompi.txt

@@ -3,3 +3,5 @@ the v1.3.2 release:
 
 https://svn.open-mpi.org/trac/hwloc/changeset/4306
 https://svn.open-mpi.org/trac/hwloc/changeset/4309
+https://svn.open-mpi.org/trac/hwloc/changeset/4314
+https://svn.open-mpi.org/trac/hwloc/changeset/4319

opal/mca/hwloc/hwloc132/hwloc/config/hwloc.m4

@@ -710,7 +710,7 @@ EOF])
     # Setup HWLOC's C, CPP, and LD flags, and LIBS
     AC_SUBST(HWLOC_REQUIRES)
     AC_SUBST(HWLOC_CFLAGS)
-    HWLOC_CPPFLAGS='-I$(HWLOC_top_srcdir)/include -I$(HWLOC_top_builddir)/include'
+    HWLOC_CPPFLAGS='-I$(HWLOC_top_builddir)/include -I$(HWLOC_top_srcdir)/include'
     AC_SUBST(HWLOC_CPPFLAGS)
     HWLOC_LDFLAGS='-L$(HWLOC_top_builddir)/src'
     AC_SUBST(HWLOC_LDFLAGS)