Merge "Revert^2 "Pass boot class path to ImageSpace::LoadBootImage.""
am: 95c5915736

Change-Id: I966ad77d0bb032db2b9ec4a541d0593ce14f7be5