Merge "Add debug info for link-time generated thunks."
am: 7090dfe84f

Change-Id: I946314648e4c485b4b7ae2f58cf46eb574244248