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

Change-Id: If2d1f53e43ee5080397ea6ae297033b771c3a8c0