Merge "Move Stopwatch to libnetdutils"