eliminate package dependency cycle

Change-Id: I7c30e5db9f5d17d24d28252b4dc58ce23835b6d8
4 files changed