Merge "Move ClasspathDeviceInfo out of Edi"