Merge "external/libyuv: Move files/fuzz to top level directory"
diff --git a/files/fuzz/Android.bp b/fuzz/Android.bp
similarity index 74%
rename from files/fuzz/Android.bp
rename to fuzz/Android.bp
index 0e49589..a8d552b 100644
--- a/files/fuzz/Android.bp
+++ b/fuzz/Android.bp
@@ -2,10 +2,10 @@
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_libyuv_files_license"
+    // all of the 'license_kinds' from "external_libyuv_license"
     // to get the below license kinds:
     //   SPDX-license-identifier-BSD
-    default_applicable_licenses: ["external_libyuv_files_license"],
+    default_applicable_licenses: ["external_libyuv_license"],
 }
 
 cc_fuzz {
diff --git a/files/fuzz/OWNERS b/fuzz/OWNERS
similarity index 100%
rename from files/fuzz/OWNERS
rename to fuzz/OWNERS
diff --git a/files/fuzz/mjpeg_dec_fuzz.cc b/fuzz/mjpeg_dec_fuzz.cc
similarity index 100%
rename from files/fuzz/mjpeg_dec_fuzz.cc
rename to fuzz/mjpeg_dec_fuzz.cc