am 04afcd25: am 8ef83bc4: am 02f96b9d: Merge "Add missing extern "C"."

* commit '04afcd25a3758090009d3261f4c573b8ed73e03a':
  Add missing extern "C".