Merge "Uevent: remove useless dir"