Clean up ImageSpace::LoadBootImage(). am: 3364d187ec am: b33e59834f
am: ea587ff496

Change-Id: I2758536e4bc2ca353e6fb23522274b129a573135