am bf281a9a: Merge change 9072 into donut

Merge commit 'bf281a9adef5a7ef342d0e5fb240d719575e5718'

* commit 'bf281a9adef5a7ef342d0e5fb240d719575e5718':
  Make changes to enable driver build in new location

host/windows/usb/legacy/driver/precomp.h

@@ -34,8 +34,13 @@ extern "C" {
 #pragma warning(default:4201)
 #pragma warning(default:4214)
 
-#include "adb_api_extra.h"
-#include "android_usb_common_defines.h"
+// Just to make adb_api.h compile. Since we will not reference any
+// of the API routines in the driver, only structures and constants,
+// we're fine with that.
+typedef void* LPOVERLAPPED;
+
+#include "adb_api.h"
+#include "adb_api_legacy.h"
 #include "android_usb_pool_tags.h"
 #include "android_usb_driver_defines.h"
 #include "android_usb_new_delete.h"

host/windows/usb/legacy/driver/sources.inc

@@ -40,8 +40,7 @@ USER_C_FLAGS=$(USER_C_FLAGS) /wd4100 /wd4002 /wd4509 /wd4390 /TP
 
 INCLUDES=$(INCLUDES); \
     	 $(IFSKIT_INC_PATH); \
-    	 ..\common; \
-    	 ..\api;
+    	 ..\..\api;
 
 TARGETLIBS=$(DDK_LIB_PATH)\usbd.lib