Merge "Android SDK Windows USB driver: Project Tango pid"