Merge "adbd: Update DeviceInterfaceGUID for WinUSB" am: 7b1dbeda0c am: 8b841946ee am: 5d7ea769fa

Change-Id: I658a4ce7b4e9ae56984c658b0c180b368a9fcab2