Revert "m7: Change inherit order"

This reverts commit 09a362148966648962aeffc0248acb0ea58d067a.

Change-Id: I8c783f946e3a1197ea71e1afda7580f0e1103b6e