Merge "BufferQueueProducer: fix buffer adjustment during setDequeueTimeout" into qt-dev am: b35167c9eb am: 2eeb9c6386
am: d53653f85f

Change-Id: I3c7c4f24d1f58d7f1d5ff3965915d24edf09db97