Merge "Remove obsolete system/extras/timeinfo."