Merge "Allow boot image for a part of the boot classpath." am: cf923f535d
am: 0e5ef5e010

Change-Id: Ie8806cce0856c28f8be58864c1a7e69ea3c19ab6