Merge "Clean up atrace.rc" into main