This is a dependency of the poller and so is needed in lib/ as well to make it usable. Also consolidate the type. Change-Id: I70ec8a200d6cd65710ac93636a9495cf24c35ef4