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