This reverts commit fed25ddc1c3de59aa1de27e95b349f86896ccb79. There has been sporadic failures in LLDB AArch64/Arm 32 buildbots since this commit. I am temporarily reverting it see if it fixes the issue. Differential Revision: https://reviews.llvm.org/D100243