Recombine hidl lib build.

Now that the libraries are combined, also combine their build so that it
is clearer what is going on.

Bug: N/A
Test: N/A
Change-Id: I0db446a99f4ff321107b78c16733b3a4abbe62a1
diff --git a/transport/Static.cpp b/transport/Static.cpp
index af16e8f..240d196 100644
--- a/transport/Static.cpp
+++ b/transport/Static.cpp
@@ -17,8 +17,8 @@
 // All static variables go here, to control initialization and
 // destruction order in the library.
 
-#include <InternalStatic.h>
 #include <hidl/Static.h>
+#include "InternalStatic.h"
 
 #include <android/hidl/manager/1.0/IServiceManager.h>
 #include <utils/Mutex.h>