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

Change-Id: Idba209d2557df88ed8851281b9a2d48185899807