am 8e4ef1cb: am 2616f297: Merge "Fix x86_64 multiply defined symbol errors."

* commit '8e4ef1cb509d26150e1987ff318d6e816fb0a47f':
  Fix x86_64 multiply defined symbol errors.