Merge "C2BqPool: Do not call cancelBuffer() after invalidated" into main

#include <C2FenceFactory.h>

#include <C2SurfaceSyncObj.h>

#include <atomic>

#include <list>

#include <map>

#include <mutex>

    }

    void invalidate() {

        std::scoped_lock<std::mutex> lock(mMutex);

        mInvalidated = true;

        mIgbpValidityToken.reset();

    }

private:

    // if the token has been expired, the buffers will not call IGBP::cancelBuffer()

    // when they are no longer used.

    std::shared_ptr<int> mIgbpValidityToken;

    bool mInvalidated{false};

    std::atomic<bool> mInvalidated{false};

};

C2BufferQueueBlockPoolData::C2BufferQueueBlockPoolData(