Merge "Use SkImages::DeferredFromAHardwareBuffer"

    // drawing into the offscreen surface, so we need to reset it here.

    canvas->resetMatrix();

    auto functorImage = SkImage::MakeFromAHardwareBuffer(mFrameBuffer.get(), kPremul_SkAlphaType,

                                                         canvas->imageInfo().refColorSpace(),

    auto functorImage = SkImages::DeferredFromAHardwareBuffer(

        mFrameBuffer.get(), kPremul_SkAlphaType, canvas->imageInfo().refColorSpace(),

        kBottomLeft_GrSurfaceOrigin);

    canvas->drawImage(functorImage, 0, 0, SkSamplingOptions(), &paint);

    canvas->restore();