Merge "Fix DOS end-of-lines in winusb INF file." into froyo