Revert "Fix standalone compilation on Linux" This broke Chromium build on Linux. This reverts commit c6a61c27e6c4f25d555fbcbd37f6d8dbdf958a39. Change-Id: I4df380eaed3ecc19b85aa99a397968ceb5ce3af8 Reviewed-on: https://chromium-review.googlesource.com/276293 Reviewed-by: Olli Etuaho <oetuaho@nvidia.com> Tested-by: Olli Etuaho <oetuaho@nvidia.com>