Merge "Revert^2 "Allow boot image for a part of the boot classpath."" am: 500b4da0e8
am: 9a47912d2e

Change-Id: Ibbb2c3e9eaf86ee3e674b110b839cbf3737f7233