s4-common: update tethering iface names

Change-Id: If80c667a2c4967b629913c65ce74bda8409e3ab4
Merge branch 'cm' into HEAD