Merge "Modify elf cache to handle elf_offsets properly."
am: 277a95bfef

Change-Id: I71c15df8d527548610cc15484f7c382e85b54552