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

* commit '414b80e17e6e5c5f90ddd00131987f4a860b8d69':
  Fix build.