Merge "Add way to specify an offset in an elf file." am: 2f1aa4e90f
am: 3bd2524d70

Change-Id: If0ddc322890e3d177574f1a2b3e63adbc8290387