Reverting r218777 while investigating buildbot breakage.
"Update CGDebugInfo to the updated API in LLVM."
Revert r218778 while investigating buldbot breakage.
"Move the complex address expression out of DIVariable and into an extra"