Revert "m7-common: Introduce m7vzw"

This reverts commit 6f11bedd7706c12b5a705c23e72c8e8964a0b7f1.

Change-Id: I37181702f8bba55e1d75d7e912826ee6815878f9