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

Change-Id: If8e50bb45525934348e8cc71579264bfbc55705b