Merge "Uevent: remove useless dir" am: 4356442029
am: b58028357f

Change-Id: I844f426b79b187bbff55800ee842f9fa1cd8e321