Merge "Revert "Add code size to CodeInfo"" am: 3c09f2c51c am: 915f982bbf
am: 7b3471a44d

Change-Id: Ie50a8e75b45355b4cf820ad222c238b8b87d6a87