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

* commit '8ef83bc46e06e8fe98e918fcb1c582d6f5807461':
  Add missing extern "C".