Merge "Fix deleter in HeifDataSource"

    sp<IMemory> mMemory;

    std::unique_ptr<HeifStream> mStream;

    bool mEOS;

    std::unique_ptr<uint8_t> mCache;

    std::unique_ptr<uint8_t[]> mCache;

    off64_t mCachedOffset;

    size_t mCachedSize;

    size_t mCacheBufferSize;

        // it's reaching max cache buffer size, need to roll window, and possibly

        // expand the cache buffer.

        size_t newCacheBufferSize = mCacheBufferSize;

        std::unique_ptr<uint8_t> newCache;

        std::unique_ptr<uint8_t[]> newCache;

        uint8_t* dst = mCache.get();

        if (newCacheBufferSize < kMaxCacheBufferSize) {

            newCacheBufferSize = kMaxCacheBufferSize;