Snap for 8598972 from 40521db6 to tm-d1-release

Change-Id: Ie5e9011d996ef8f95731e63c6548f209e80626f3

plugin_store/C2VdaBqBlockPool.cpp

@@ -562,11 +562,12 @@ c2_status_t C2VdaBqBlockPool::Impl::fetchGraphicBlock(
     }
 
     std::shared_ptr<C2SurfaceSyncMemory> syncMem;
+    // TODO: the |owner| argument should be set correctly.
     std::shared_ptr<C2GraphicAllocation> allocation =
             mTrackedGraphicBuffers.getRegisteredAllocation(uniqueId);
     auto poolData = std::make_shared<C2BufferQueueBlockPoolData>(
-            slotBuffer->getGenerationNumber(), mProducerId, slot,
-            mProducer->getBase(), syncMem, 0);
+            slotBuffer->getGenerationNumber(), mProducerId, slot, std::make_shared<int>(0),
+            mProducer->getBase(), syncMem);
     mTrackedGraphicBuffers.updatePoolData(slot, poolData);
     *block = _C2BlockFactory::CreateGraphicBlock(std::move(allocation), std::move(poolData));
     if (*block == nullptr) {