[automerger skipped] Merge "Add bufferqueue headers to libgui_headers" am: df9ad97a53 am: 32182bdb75
am: bed4070c49 -s ours
am skip reason: change_id I701780a55543889473ad174f25fa761cf5edd452 with SHA1 cb04dee754 is in history

Change-Id: I048acb8de6f6163b208c2567b4084cbdced5bd17