Merge "Fix the mStopTimeNs not be reset in Stopwatch#Restart"