Revert "m7: Change inherit order"

This reverts commit 09a362148966648962aeffc0248acb0ea58d067a.

Change-Id: I8c783f946e3a1197ea71e1afda7580f0e1103b6e
Revert "Revert "m7: Change inherit order""

This reverts commit 3513b2bc79f562b40ce12e489d984a027d5667ed.

Change-Id: Ic1fa204db8e36fa6eaf8073e4e0145d881af422b
Merge branch 'cm-11.0' into kk_mkt