More cleanup.

Removed unnecessary includes from SoaapPass.cpp and also removed LLVM bug 15253 workaround as it has since been fixed in r182387 (as has LLVM bug 15767).