Merge "Revert^2 "Add code size to CodeInfo""