Revert "m7spr: Change inherit order"

This reverts commit 2ca4f7f58e9a2fe16160d0a055aa2272d934c1c7.

Change-Id: Icab9e4a0ba94a56029e3bb6906f38d66db96236d
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_htc_m7spr into cd-4.4

Conflicts:
	cd.mk