Revert "m7vzw: Change inherit order"

This reverts commit e64312fe7846e7adf7bde7e5e556343c1d85d8c5.

Change-Id: Ibb5235247a968cbbe734e23dc36a229df80cdf3f
Merge branch 'cm' into HEAD