Merge "Use gralloc1 usage in AHardwareBuffer_describe" into oc-dev

#include <ui/GraphicBuffer.h>

#include <system/graphics.h>

#include <hardware/gralloc1.h>

#include <grallocusage/GrallocUsageConversion.h>

#include <private/android/AHardwareBufferHelpers.h>

    outDesc->width = gbuffer->getWidth();

    outDesc->height = gbuffer->getHeight();

    outDesc->layers = gbuffer->getLayerCount();

    uint64_t producerUsage = 0;

    uint64_t consumerUsage = 0;

    android_convertGralloc0To1Usage(gbuffer->getUsage(), &producerUsage, &consumerUsage);

    AHardwareBuffer_convertFromGrallocUsageBits(&outDesc->usage0, &outDesc->usage1,

            gbuffer->getUsage(), gbuffer->getUsage());

            producerUsage, consumerUsage);

    outDesc->format = AHardwareBuffer_convertFromPixelFormat(

            static_cast<uint32_t>(gbuffer->getPixelFormat()));

}