Revert "pull in m7 variants"

This reverts commit a5981257a449b175a6e2a2781a9f118536302f1b.

Conflicts:
	default.xml

Change-Id: I6060bb3ce1baa1b0d4c627edad3bd7be327459b3