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

Change-Id: Id82bf530458bcfa6d3684c2e0e62bc323cb3a898