diff --git a/test_main.cpp b/test_main.cpp
index 7859156..658a7eb 100644
--- a/test_main.cpp
+++ b/test_main.cpp
@@ -94,6 +94,12 @@
     EXPECT_EQ(myString, "great");
     EXPECT_STREQ(anotherCString, "great");
 
+    const hidl_string t = "not so great";
+    std::string myTString = t;
+    const char * anotherTCString = t;
+    EXPECT_EQ(myTString, "not so great");
+    EXPECT_STREQ(anotherTCString, "not so great");
+
     // Comparisons
     const char * cstr1 = "abc";
     std::string string1(cstr1);
diff --git a/transport/base/1.0/Android.bp b/transport/base/1.0/Android.bp
index c595bb2..125ce1a 100644
--- a/transport/base/1.0/Android.bp
+++ b/transport/base/1.0/Android.bp
@@ -30,6 +30,7 @@
     ],
     out: [
         "android/hidl/base/1.0/types.h",
+        "android/hidl/base/1.0/hwtypes.h",
         "android/hidl/base/1.0/IBase.h",
         "android/hidl/base/1.0/IHwBase.h",
         "android/hidl/base/1.0/BnHwBase.h",