Merge "dumpstate: don't attempt to use vril-dump, it breaks adb bugreport"

            "su", "root", "wlutil", "counters", NULL);

#endif

#ifdef BROKEN_VRIL_IS_FIXED_B_4442803

   char ril_dumpstate_timeout[PROPERTY_VALUE_MAX] = {0};

    property_get("ril.dumpstate.timeout", ril_dumpstate_timeout, "30");

    if (strlen(ril_dumpstate_timeout) > 0) {

        run_command("DUMP VENDOR RIL LOGS", atoi(ril_dumpstate_timeout),

                "su", "root", "vril-dump", NULL);

    }

#endif

    print_properties();