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

Change-Id: I05ffa0f44bbf1e9e6807389ea6ad5c9e06489e35