Merge "Update revision of Android SDK USB driver for Windows."