toollabs: lint cleanup

Change-Id: I748652a44071a98c74637c92f6b66f81213c5b9a