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

Change-Id: I597d51f1a01af8d02f387466a9e9844667dcf7d6