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

Change-Id: Ie2c75b7ece862894b47768cb755bb250a7a7431e