Merge "ueventd: replace char** links with std::vector<std::string>" am: 162118928e
am: a778c81e11

Change-Id: I9511394bb5edd957ca8c1a930a09c2006c6372ea