Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index 00d2f2b..cebb01b 100644
--- a/transport/base/1.0/Android.bp
+++ b/transport/base/1.0/Android.bp
@@ -10,9 +10,6 @@
         "types.hal",
         "IBase.hal",
     ],
-    types: [
-        "DebugInfo",
-    ],
     gen_java: true,
 }
 
diff --git a/transport/safe_union/1.0/Android.bp b/transport/safe_union/1.0/Android.bp
index 0b52fe1..88c7d5d 100644
--- a/transport/safe_union/1.0/Android.bp
+++ b/transport/safe_union/1.0/Android.bp
@@ -10,9 +10,6 @@
     srcs: [
         "types.hal",
     ],
-    types: [
-        "Monostate",
-    ],
     gen_java: true,
 }