Merge "Remove DwarfError.h that moved." am: d42e093793
am: 228de8a7b0

Change-Id: Id590ef1dc53a074c429c620cf8ccd77ed9fe6b5c