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

Change-Id: I28abb23bbc49d849f3f8871ff97745da27077c5c