am 8007a21e: am 6deb3d5c: am 35fbf787: Merge "Fix build from implicit declaration."

* commit '8007a21e799ec05a45435d4b688116e88de98221':
  Fix build from implicit declaration.