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

Change-Id: I4299d95b950f2fa9cc6253a4e22c6fe00981c59c