Merge "Use new UsbManager#getPorts API"