Revert "Use framework boot image extension."
am: 42b9c19772

Change-Id: Ifda385e2a381de2487587c6c62a1c206546e3d89