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

Change-Id: I5685aa055f1458918c0ed22921caf6f7f13efece