Merge "Fix build breakage in dwarf_test."