am 307aadb8: Merge "libc: Add missing C++ guards to <pathconf.h>" into gingerbread

Merge commit '307aadb8473744c3d946add8b3e4947ada5481aa' into gingerbread-plus-aosp

* commit '307aadb8473744c3d946add8b3e4947ada5481aa':
  libc: Add missing C++ guards to <pathconf.h>