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

Change-Id: I1232ea3cd0439b459ba91e27965fbaa7963a0c20