Clean up linker patches in codegens.
am: 2d06e029b1

Change-Id: I7121bcf8a8f362ecf4d7bdd12d5c4445e715ce6b