Merge "Add uptimeNanos to SystemClock"