Merge "BLASTBufferQueueTest: Fix leak of BBQ and SC"