Clean up linker patches in codegens. am: 2d06e029b1 am: 6c0f93d830
am: 8402fb5866

Change-Id: I51dcd0c1407b59624149418c47429cf528d8e10e