Merge "Corresponding changes for latest libtextclassifier import"