am 51fb1113: (-s ours) am 0f7eb7ee: fix the build.

* commit '51fb1113f80d04be9775ab7f9953055e4b7d636b':
  fix the build.