Merge "Fix --adb-port not working isssue."