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