Merge "Fix multi-image boot class path construction."