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

Change-Id: I038dcbbd11f35a494a5197b315278b35b9a72236