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

Change-Id: I13db276456899ce1b7808c99f9e0de154f81016d