Merge "Add support for booting with a boot classpath not fully AOTed."
am: 98b970dd74

Change-Id: I979686f5bf81bab737a936b00736ac0c3ab35a82