cleanup

Change-Id: Id10d0a97aaaaf8a5d1b8f469a577528d63709106
sensorservice: this is now in common folder

Change-Id: I3409d7b8b6ff381287ee41c43071f5d0bc7ddfba