Merge "Add test mapping for CtsUsbSerialTestApp"