Fix an ASAN failure introduced with r225537 (adding the -universal-headers to llvm-obdump).

And a fly by fix to some formatting issues with the same commit.

llvm-svn: 225550