Revert "m7spr: Change inherit order"

This reverts commit 2ca4f7f58e9a2fe16160d0a055aa2272d934c1c7.

Change-Id: Icab9e4a0ba94a56029e3bb6906f38d66db96236d