DO NOT MERGE: adb: reenable (and fix) Windows build.

This branch is still getting used to build some SDK targets.

Bug: http://b/30767018
Change-Id: I85b03a80d69ceef5e5333505f0832129387ed2da
diff --git a/adb/sysdeps/mutex.h b/adb/sysdeps/mutex.h
index ef5d9b1..e33551f 100644
--- a/adb/sysdeps/mutex.h
+++ b/adb/sysdeps/mutex.h
@@ -20,7 +20,7 @@
 
 #include <windows.h>
 
-#include <android-base/macros.h>
+#include <base/macros.h>
 
 #include "adb.h"