am 58b42b98: Fix portable build.

* commit '58b42b986742565cccfde4366495ad23d0ba57d1':
  Fix portable build.