Merging r310253 and r310267:

Merging r310253 and r310267:
------------------------------------------------------------------------
r310253 | sdardis | 2017-08-07 06:30:03 -0700 (Mon, 07 Aug 2017) | 2 lines

[DebugInfo][DWARF] Use PRIx64 explicitly in output.

------------------------------------------------------------------------

------------------------------------------------------------------------
r310267 | sdardis | 2017-08-07 09:08:11 -0700 (Mon, 07 Aug 2017) | 2 lines

[DebugInfo][DWARF] Address paulr's comment on rL310253.

------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_50@310398 91177308-0d34-0410-b5e6-96231b3b80d8