Revert^3 "Boot image extension." am: f5c5eb30fc
am: 4ea9b7e1af

Change-Id: Ifb4c453b52b79d430a23510f563511cd291db7d4