Merge "Fix circular dependencies for ContainsBootClassLoaderNonImageClass"