Merge "Revert "Allow boot image for a part of the boot classpath.""
am: 99e17397f7

Change-Id: I7070a57f7a41f9f6cca2c092beafbed362f89084