Revert^2 "Use framework boot image extension."
am: 81ba7db6eb

Change-Id: I0c62e175e936c00dedb929840f967e796a8991d5