Merge "fix fallout from binderizing BufferQueues consumer side"