Snap for 15086948 from 8f11ff90bd6b8c473cfc43a34198a1a5f2d422dc to 26Q2-release Change-Id: I7d6316abc706b3be10aeb758adda12b4b200c3f6

diff --git a/xsd/compatibilityMatrix/schema/current.txt b/xsd/compatibilityMatrix/schema/current.txt
index 16d0fae..8fb9a47 100644
--- a/xsd/compatibilityMatrix/schema/current.txt
+++ b/xsd/compatibilityMatrix/schema/current.txt

@@ -1,4 +1,5 @@
-// Signature format: 2.0
+// Signature format: 6.0
+// - style=java
 package compatibility.matrix {
 
   public class Avb {
@@ -50,11 +51,11 @@
     ctor public Hal();
     method public String getExclusiveTo();
     method public String getFormat();
-    method public java.util.List<java.lang.String> getFqname();
+    method public java.util.List<String> getFqname();
     method public String getName();
     method public String getOptional();
     method public boolean getUpdatableViaApex();
-    method public java.util.List<java.lang.String> getVersion();
+    method public java.util.List<String> getVersion();
     method public java.util.List<compatibility.matrix.Interface> get_interface();
     method public void setExclusiveTo(String);
     method public void setFormat(String);
@@ -65,9 +66,9 @@
 
   public class Interface {
     ctor public Interface();
-    method public java.util.List<java.lang.String> getInstance();
+    method public java.util.List<String> getInstance();
     method public String getName();
-    method public java.util.List<java.lang.String> getRegexInstance();
+    method public java.util.List<String> getRegexInstance();
     method public void setName(String);
   }
 
@@ -90,25 +91,25 @@
   public class Sepolicy {
     ctor public Sepolicy();
     method public String getKernelSepolicyVersion();
-    method public java.util.List<java.lang.String> getSepolicyVersion();
+    method public java.util.List<String> getSepolicyVersion();
     method public void setKernelSepolicyVersion(String);
   }
 
   public class SystemSdk {
     ctor public SystemSdk();
-    method public java.util.List<java.lang.String> getVersion();
+    method public java.util.List<String> getVersion();
   }
 
   public class VendorNdk {
     ctor public VendorNdk();
-    method public java.util.List<java.lang.String> getLibrary();
+    method public java.util.List<String> getLibrary();
     method public String getVersion();
     method public void setVersion(String);
   }
 
   public class Vndk {
     ctor public Vndk();
-    method public java.util.List<java.lang.String> getLibrary();
+    method public java.util.List<String> getLibrary();
     method public String getVersion();
     method public void setVersion(String);
   }

diff --git a/xsd/compatibilityMatrix/schema/removed.txt b/xsd/compatibilityMatrix/schema/removed.txt
index d802177..c079792 100644
--- a/xsd/compatibilityMatrix/schema/removed.txt
+++ b/xsd/compatibilityMatrix/schema/removed.txt

@@ -1 +1,2 @@
-// Signature format: 2.0
+// Signature format: 6.0
+// - style=java

diff --git a/xsd/halManifest/schema/current.txt b/xsd/halManifest/schema/current.txt
index 7af4b03..1d23c11 100644
--- a/xsd/halManifest/schema/current.txt
+++ b/xsd/halManifest/schema/current.txt

@@ -1,12 +1,13 @@
-// Signature format: 2.0
+// Signature format: 6.0
+// - style=java
 package hal.manifest {
 
   public class Hal {
     ctor public Hal();
-    method public java.util.List<java.lang.String> getAccessor();
+    method public java.util.List<String> getAccessor();
     method public String getExclusiveTo();
     method public String getFormat();
-    method public java.util.List<java.lang.String> getFqname();
+    method public java.util.List<String> getFqname();
     method public String getMaxLevel();
     method public String getMinLevel();
     method public String getName();
@@ -14,7 +15,7 @@
     method public hal.manifest.Hal.Transport getTransport();
     method public String getUpdatableViaApex();
     method public String getUpdatableViaSystem();
-    method public java.util.List<java.lang.String> getVersion();
+    method public java.util.List<String> getVersion();
     method public java.util.List<hal.manifest.Interface> get_interface();
     method public void setExclusiveTo(String);
     method public void setFormat(String);
@@ -41,7 +42,7 @@
 
   public class Interface {
     ctor public Interface();
-    method public java.util.List<java.lang.String> getInstance();
+    method public java.util.List<String> getInstance();
     method public String getName();
     method public void setName(String);
   }
@@ -90,19 +91,19 @@
 
   public class SystemSdk {
     ctor public SystemSdk();
-    method public java.util.List<java.lang.String> getVersion();
+    method public java.util.List<String> getVersion();
   }
 
   public class VendorNdk {
     ctor public VendorNdk();
-    method public java.util.List<java.lang.String> getLibrary();
+    method public java.util.List<String> getLibrary();
     method public String getVersion();
     method public void setVersion(String);
   }
 
   public class Vndk {
     ctor public Vndk();
-    method public java.util.List<java.lang.String> getLibrary();
+    method public java.util.List<String> getLibrary();
     method public String getVersion();
     method public void setVersion(String);
   }

diff --git a/xsd/halManifest/schema/removed.txt b/xsd/halManifest/schema/removed.txt
index d802177..c079792 100644
--- a/xsd/halManifest/schema/removed.txt
+++ b/xsd/halManifest/schema/removed.txt

@@ -1 +1,2 @@
-// Signature format: 2.0
+// Signature format: 6.0
+// - style=java