am 33ae28bf: Merge "Fix implicit function declarations in goldfish."

* commit '33ae28bf3d7a3ffd00cad80284be2ac33155a7f3':
  Fix implicit function declarations in goldfish.