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

Change-Id: Icc92fb9bc4c5597261396e8a9698a016eb8d593b