Merge "Add minimal support for Dwarf 5."
am: e44bf1a4a2

Change-Id: I7cac4a4fbc8d5e77c9642cf2909c962bb12bad7c