Merge "Export libtextclassifier am: c121edde42 am: d1a3338917" into rvc-d1-dev-plus-aosp