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

Change-Id: Id201b5e95d40c47580299c02db738f676c56ce11