am 41bcf3e4: (-s ours) Fix build.

* commit '41bcf3e425b9a1792b65b16b1c115b018348bde7':
  Fix build.