Merge "Fix build: Extend the scope of CodeInfo object in ELF writer."
am: 65e463cf7e

Change-Id: I6750c371ef2d8232387c044d2c1e83411dda4706