Merge "Remove dmtracedump from development/build" into main