Merge "Remove explicit size from CodeInfo."
am: 2dc252e37d

Change-Id: I145f1712440ccdc37eb5fe183e5e5f143aaa358c