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

Change-Id: I21f341739cb283ffc3435ce20f6f0ee8f55fce7f