Cleanup: upstream differences from local branch
Cleanup: upstream differences from local branch

(cherry picked from commit 75ed8c7b4b0e9c3e1db132f74cbee990f84c417f)

apple/swift-lldb,apple/swift-lldb,apple/swift-lldb,apple/swift-lldb,apple/swift-lldb,apple/swift-lldb