Revert "m7vzw: Change inherit order"

This reverts commit e64312fe7846e7adf7bde7e5e556343c1d85d8c5.

Change-Id: Ibb5235247a968cbbe734e23dc36a229df80cdf3f
Revert "Revert "m7vzw: Change inherit order""

This reverts commit ab79bf2a9ac825a37c3721c337f5336b9e1482ee.

Change-Id: I0434b567c59b30133c5a0fd38f8dca54dea7ed3d
m7vzw: default to Global network mode

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