Merge "Remove the CodeOffset helper class."
am: 3b562b18ba

Change-Id: I2486105cc94d371129fd6a388c40e44f0ce2624d