totemc2: dis-inherit s4-common

Change-Id: I9d012f00ad1f996998fbd257eee1492b3ebd5602