Try and unblock issue found in: http://lab.llvm.org:8011/builders/lldb-x86_64-linux/builds/3564




git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@179810 91177308-0d34-0410-b5e6-96231b3b80d8
More fallout unique_ptr changes for from http://lab.llvm.org:8011/builders/lldb-x86_64-linux/builds/3565.



git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@179815 91177308-0d34-0410-b5e6-96231b3b80d8