Merge "Revert "Allow boot image for a part of the boot classpath.""