am fc6257db: am 49bded21: Fix portable build.

* commit 'fc6257db6294c86c9a96f560cdba8973674b535f':
  Fix portable build.