Merge "Explicitly require root privs for resolv_unit_test"