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

Change-Id: Ic7dde684f6a75db586aad2e3d96a223eb416f911