Revert "m7spr: Change inherit order"

This reverts commit 2ca4f7f58e9a2fe16160d0a055aa2272d934c1c7.

Change-Id: Icab9e4a0ba94a56029e3bb6906f38d66db96236d
Revert "Revert "m7spr: Change inherit order""

This reverts commit e28f92d225e217a93b96bb5b4dbaaa41cb3a5f08.

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