Merge "Revert "Don't initialize atrace if it's already disabled.""