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

Change-Id: Idf566f7aa0cc1df292cdf4da7c982388b4fa5bde