am 1604cb97: Merge "Fix x86_64 gtest."

* commit '1604cb973e96ede4af275e676f0f35af46641f03':
  Fix x86_64 gtest.