Merge "adb: logging: newlines, thread ids, error code overwriting"