Merge branch 'temp_72223856' of persistent-https://android.git.corp.google.com/platform/external/libtextclassifier into merge1 am: d16be73edc
am: 9ac27ad018

Change-Id: I8f5ca294024401ec4924751acb30221578188351