Merge "Revert "Add code size to CodeInfo""