Merge "Fix non-Linux builds."
am: 9cea913903

* commit '9cea9139033a4d04437ebc5542e9466fd67137fe':
  Fix non-Linux builds.