diff --git a/Android.bp b/Android.bp
index d67407b..c26281e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,7 +39,7 @@
 // Generate protocol source files used by both client and server
 wayland_protocol_codegen {
     name: "wayland_extension_protocol_sources",
-    cmd: "$(location wayland_scanner) code < $(in) > $(out)",
+    cmd: "$(location wayland_scanner) private-code < $(in) > $(out)",
     suffix: ".c",
     srcs: [":wayland_extension_protocols"],
     tools: ["wayland_scanner"],
@@ -73,7 +73,7 @@
         "-Wextra",
         "-Werror",
         "-g",
-        "-fvisibility=hidden"
+        "-fvisibility=hidden",
     ],
     static_libs: ["libwayland_client"],
     generated_sources: ["wayland_extension_protocol_sources"],
@@ -92,7 +92,7 @@
         "-Wextra",
         "-Werror",
         "-g",
-        "-fvisibility=hidden"
+        "-fvisibility=hidden",
     ],
     static_libs: ["libwayland_server"],
     generated_sources: ["wayland_extension_protocol_sources"],
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}
diff --git a/chromium.org/NOTICE b/chromium.org/NOTICE
deleted file mode 100644
index 8ab3291..0000000
--- a/chromium.org/NOTICE
+++ /dev/null
@@ -1,33 +0,0 @@
-Copyright © 2008-2013 Kristian Høgsberg
-Copyright © 2010-2013 Intel Corporation
-Copyright © 2013      Rafael Antognolli
-Copyright © 2013      Jasper St. Pierre
-Copyright © 2014      Jonas Ådahl
-Copyright © 2014      Jason Ekstrand
-Copyright © 2014-2015 Collabora, Ltd.
-Copyright © 2015      Red Hat Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
----
-
-The above is the version of the MIT "Expat" License used by X.org:
-
-    http://cgit.freedesktop.org/xorg/xserver/tree/COPYING