Merge changes I7695dc5d,I155fa5c5

* changes:
  Remove active_buffer_bit_mask_ from BufferNode.
  Remove the functionality of promoting a BufferHubBuffer to ProducerBuffer.