Merge "Add proper support for embedded elf files." am: 537c68c8ed am: 863fcdb0ca am: b41875be0b
am: 723f414ac2

Change-Id: I46fd448f79e9c71281030210c3f12b2fbb7e01a2