Merge "msm_serial_hs: Fix the logic for numbering the serial device"