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

Change-Id: I87cbd407751f93fdb08701684253603dff732de5