pull in m7 variants

Change-Id: Ic7f6ba174e1cdbf77f5f972ffb5fd8626b0193a9

Conflicts:
	default.xml
we can pull these from slim instead

Change-Id: I980bf198354a464f95df80bd95c3ea5587ca7ade