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

Change-Id: I77cfa66ec34c5c30e44062cfabf0454253a3d92d