Merge "Cleanup TextClassifier APIs"