Merge "Add bufferqueue headers to libgui_headers"
am: df9ad97a53

Change-Id: Ifc5acc1463cac011e8cb7cf0804fbb536a8541ba