Merge "dmtracedump: fix compilation warnings"