Reapply debug info changes now that r224385 has been recommitted to clang (in r224941)