Merge "Add ClassLoader to app-image roots."