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