am 6a39dafe: Merge "Use extern "C" rather than BEGIN/END_DECLS."

* commit '6a39dafe872d4e1b3da8df4c4e5e79b66109e3d9':
  Use extern "C" rather than BEGIN/END_DECLS.