Merge "Revert "libgui: Remove custom BufferQueue allocators""