Merge "Add bufferqueue headers to libgui_headers"