m7-common: update guard for m7 variants

Change-Id: I7cb1fa8d9989faf447888691ba84435140e20554