Revert^4 "Boot image extension." am: 2191069047
am: aee9414cfd

Change-Id: Icb2d652403aac6fdc4b75a281a69bb34b2e3e1c6