am 13f092c0: am b82be174: Merge "Fix implicit function declarations."

* commit '13f092c0d7341594c09983cb28586bab80b92121':
  Fix implicit function declarations.