WIP: m7: consolidate all m7 variants

Change-Id: Idcf96dbccdd55823e99afa63c674fcdfd0594147