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

Change-Id: I1a7866a7d5862e0a2b5737c8117c7045a61d308c