Merge "Android SDK Windows USB driver: Glass PID."