Merge "Add DwarfOp support."
am: 3f220aaa63

Change-Id: I1bf8a417889a9ad31055c05e3149f985e1dbc591