am 7a8cfbfd: am b63c1328: am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."

* commit '7a8cfbfd7fda79a0e16c0920d85a4644cf7f211d':