Revert "Revert "m7spr: Change inherit order""

This reverts commit e28f92d225e217a93b96bb5b4dbaaa41cb3a5f08.

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

Conflicts:
	cd.mk