Escape a newline added in the previous commit when verifying the flags
passed to the build, diff, or status commands.
Merge upstream LLDB r194487:

  Log failure to restore thread state in ThreadPlanCallFunction::DoTakedown

  In order to help track down llvm.org/pr17226.

Sponsored by:	DARPA, AFRL