Eliminate a cycle in class hierarchy.

Bug: 30441125
Change-Id: I861b9ce90e1b148515d7519d399aae3a3322aced
8 files changed