Merge "Revert^2 "Add code size to CodeInfo"" am: 438cc2b34b am: c46303fe0b
am: 4890f36cbd

Change-Id: I89001fccd8b3bfb63b156621bc0d7c3afd9df841