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

Change-Id: Ic8fb63c5c62f6551a36285d61f8e6e472bdc624c