Merge "Added device name to bugreport file."

    if (is_redirecting) {

        ds.bugreport_dir_ = dirname(use_outfile);

        ds.base_name_ = basename(use_outfile);

        std::string build_id = android::base::GetProperty("ro.build.id", "UNKNOWN_BUILD");

        std::string device_name = android::base::GetProperty("ro.product.device", "UNKNOWN_DEVICE");

        ds.base_name_ = android::base::StringPrintf("%s-%s-%s", basename(use_outfile),

                                                    device_name.c_str(), build_id.c_str());

        if (do_add_date) {

            char date[80];

            strftime(date, sizeof(date), "%Y-%m-%d-%H-%M-%S", localtime(&ds.now_));