Merge "Add code size to CodeInfo" am: a05344750f
am: 6446217085

Change-Id: I2e50423deaacc410403fc288f43b3ecfcf4ee202