am 49bded21: Fix portable build.

* commit '49bded21270e8087e11d933d7b19aee22c0d8649':
  Fix portable build.