Merge "Revert "Compile link-time thunks in codegen.""
am: 6371249ce0

Change-Id: I6b1400f55f95ecafe368dd60393cf2ed595463b0