Merge "Modify elf cache to handle elf_offsets properly."