Merge "Revert "Remove obsolete ueventd.rc rules."" am: 36b5dd845c am: 5759ca8da2
am: 6e5643c14c

Change-Id: I0916de07e01f3bd30203335274137fc1b7134125