Merge "BufferQueue: add a setMaxAcquiredBufferCount check" into jb-mr1-dev