Merge "Update atrace to work with tracefs, not debugfs"