Merge "Fix x86_64 multiply defined symbol errors."