Source changes to fix multiply-defined symbols error when linking chrome.bc