Merge "gadget: Fix bad merge in u_serial.c"