Merge "Uevent: remove useless dir" am: 4356442029 am: b58028357f am: 0e2ccb4874
am: 50bd60e0f5

Change-Id: I71c7516f1ab0aa57454a9bf3d4836718482ab2f2