Revert "[llvm] Partial revert, hopefully fix LLVM module maps build"

This reverts commit 8d897ec9.

I tentativily landed John's patch in D115553 to fix the macOS bots but
it's still failing as shown here:

https://green.lab.llvm.org/green/job/lldb-cmake/39267/



Signed-off-by: Med Ismail Bennani <medismail.bennani@gmail.com>