Merge "Revert^2 "Compile link-time thunks in codegen.""
am: 6c35339915

Change-Id: I70118802e1a9424da187672d7a14ed8afb1aec8b