Merge "Use monotonic system time instead of gettimeofday"