m7wls: inherit 8960 common, clean up.

Change-Id: I07df81bc84060bbb7130bbac9577fbeba66af375