Merge "Add bufferqueue headers to libgui_headers" am: df9ad97a53
am: 32182bdb75

Change-Id: Ia4a58c659777659f73273db8a2f8386821c33b8a