Merge "SDK: updating android Windows USB Driver."