Merge "Fix loading ueventd.${ro.hardware}.rc."
am: 1fefb9f129

Change-Id: I7573922226736ece024e31e15fc1a7b9e2d08a9f