Merge "Update traceview for ddmlib API change"