Revert^2 "Boot image extension." am: 02820f4247
am: 570461a2aa

Change-Id: I15692c22ba45387a5cae034477d038c7a471298c