Revert "Revert "m7vzw: Change inherit order""

This reverts commit ab79bf2a9ac825a37c3721c337f5336b9e1482ee.

Change-Id: I0434b567c59b30133c5a0fd38f8dca54dea7ed3d