Merge "SystemClock JNI update"