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

Change-Id: I12a83ba296b306ce1cc6ee71d570bf11aaf292c8