Add recognition of two more armv7 variants, armv7m and armv7em.
<rdar://problem/13361372>