am 4e7e84fe: am 1604cb97: Merge "Fix x86_64 gtest."

* commit '4e7e84fe4816805caf65381cec11585381abd9bc':
  Fix x86_64 gtest.