Fix x86_64 multiply defined symbol errors.

Change-Id: Ib4c2ffc8b9f9dfd57ec4e0ca76d61459dfbbd775
2 files changed