This commit re-applies 9ee97ce3b8, which was reverted by 61d417ce because it broke the LLDB data formatter tests. It also re-applies 6148c79a (the manual GN change associated to it). Differential Revision: https://reviews.llvm.org/D127444
9ee97ce3b8
61d417ce
6148c79a