am 35fbf787: Merge "Fix build from implicit declaration."

* commit '35fbf7876059b64d069d60fd9eab761718344271':
  Fix build from implicit declaration.