am e8e50cdc: am 941fa37f: am 55089c32: Merge "Android SDK Windows USB driver: Glass PID."

* commit 'e8e50cdc147579eb4dc90a6067f8fb496b2e5665':