Merge "Add a warning to the atrace binary for deprecating vendor categories"