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

Change-Id: I709de40d76194df14f14054cef68db022e29629b