Update contiki upstream