Merge "Fix multi-image boot class path construction."
am: b63a4e8dc6

Change-Id: I584ef9b16d2ab103558f92442ca4e47d3e8f80f3