Prevent circular dependencies in library project dependencies

Change-Id: Ia43c2436e01032ace7e2b13e59d60d10f71e7004
6 files changed