Move Status to libhidl.

Bug: 31226252
Change-Id: I9615071be3845eb3290fb6c4fa5ae622f56a4d80
diff --git a/generateCpp.cpp b/generateCpp.cpp
index 57ed349..9a6bed5 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -165,7 +165,7 @@
     out << "#include <hidl/IServiceManager.h>\n";
 
     if (isInterface) {
-        out << "#include <hwbinder/Status.h>\n";
+        out << "#include <hidl/Status.h>\n";
     }
 
     out << "#include <utils/NativeHandle.h>\n\n";
@@ -344,9 +344,9 @@
     out << "\n";
 
     out << "#include <hidl/HidlSupport.h>\n";
+    out << "#include <hidl/Status.h>\n";
     out << "#include <hwbinder/IBinder.h>\n";
     out << "#include <hwbinder/IInterface.h>\n";
-    out << "#include <hwbinder/Status.h>\n";
 
     out << "\n";