Merge "ueventd: fixup ueventd_test.cpp"