Clean up some unnecessary inheritance.

Bug: 30681529
Change-Id: I84fa1085cc18b167d506dec3b3054d9f74d3d3e7
4 files changed