Merge "Fix InsertDexFileInToClassLoader to handle null class loaders"