Revert "Revert "m7: Change inherit order""

This reverts commit 3513b2bc79f562b40ce12e489d984a027d5667ed.

Change-Id: Ic1fa204db8e36fa6eaf8073e4e0145d881af422b