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

Change-Id: I73fc24cadc2c647b3c0a507b30b625ffaf8536ca