Merge "Add DwarfOp support." am: 3f220aaa63
am: 1ab138c64e

Change-Id: Id502479a0a7646dbea7026e2f8a114acc679505d