Merge "Pass the debug_info_offset explicitly."
am: 67ab1c5517

Change-Id: Ifa37950eb855a3e913f945afcd4696f295e1e6b1