Merge "Add code size to CodeInfo"
am: a05344750f

Change-Id: Ie93705d085ca3785919e135cbe288513ff20b4cf