[automerger skipped] Revert "[SurfaceFlinger] Remove force GPU composition for layers with color transform." am: 9055674c6c
am: 1b9e46dfaf -s ours
am skip reason: change_id Ie0cdf9bd696ed4926fdd931d3c8a82fafd1a203f with SHA1 ad61a81779 is in history

Change-Id: I51e7ea0b3604fc09bc0ad572527f33ebe2759b81
diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp
index fcbfba9..c57f58b 100644
--- a/libs/gui/Android.bp
+++ b/libs/gui/Android.bp
@@ -15,6 +15,10 @@
     name: "libgui_headers",
     vendor_available: true,
     export_include_dirs: ["include"],
+
+    // we must build this module to get the required header as that is generated
+    export_shared_lib_headers: [ "android.hidl.token@1.0-utils" ],
+    shared_libs: [ "android.hidl.token@1.0-utils" ],
 }
 
 cc_library_shared {
diff --git a/libs/gui/bufferqueue/OWNERS b/libs/gui/bufferqueue/OWNERS
new file mode 100644
index 0000000..cbe9317
--- /dev/null
+++ b/libs/gui/bufferqueue/OWNERS
@@ -0,0 +1,5 @@
+chz@google.com
+lajos@google.com
+pawin@google.com
+taklee@google.com
+wonsik@google.com