Merge "Fix BufferHubQueueProducer::dequeueBuffer" into oc-dev am: 1134dd38d8
am: 6c7e8bee63

Change-Id: I8147bd8fa2a183231d43dff731053b015c67dee4