Merge "libgui: fix a race in BufferQueueProducer::allocateBuffers"