Merge "Prevent circular dependencies in library project dependencies"