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

Change-Id: I9755f06667784af812732d2fe286c15dcae64f46