Remove inheritance implemented with the bad "superclass calls subclass through interface" pattern, and replace it with composition. Test: builds Change-Id: If323f89360455b3f98b40777edaaaa265bb3b5fc
Remove inheritance implemented with the bad "superclass calls subclass through interface" pattern, and replace it with composition. Test: builds Change-Id: If323f89360455b3f98b40777edaaaa265bb3b5fc