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

* commit '6deb3d5cf266ce18aefb819c5994f504e0df103b':
  Fix build from implicit declaration.