Merge "BufferQueue: clean up buffer counting" into jb-mr1-dev