Merge "BufferQueue: Add StreamSplitter"