Merge "Fix field widths in dump, so as to make columns line up." into main

    uint64_t total = 0;

    result.append("GraphicBufferAllocator buffers:\n");

    const size_t count = list.size();

    StringAppendF(&result, "%14s | %11s | %18s | %s | %8s | %10s | %s\n", "Handle", "Size",

    StringAppendF(&result, "%18s | %12s | %18s | %s | %8s | %10s | %s\n", "Handle", "Size",

                  "W (Stride) x H", "Layers", "Format", "Usage", "Requestor");

    for (size_t i = 0; i < count; i++) {

        const alloc_rec_t& rec(list.valueAt(i));

        std::string sizeStr = (rec.size)

                ? base::StringPrintf("%7.2f KiB", static_cast<double>(rec.size) / 1024.0)

                : "unknown";

        StringAppendF(&result, "%14p | %11s | %4u (%4u) x %4u | %6u | %8X | 0x%8" PRIx64 " | %s\n",

        StringAppendF(&result, "%18p | %12s | %4u (%4u) x %4u | %6u | %8X | 0x%8" PRIx64 " | %s\n",

                      list.keyAt(i), sizeStr.c_str(), rec.width, rec.stride, rec.height,

                      rec.layerCount, rec.format, rec.usage, rec.requestorName.c_str());

        total += rec.size;