[automerger skipped] Merge "Switch TextClassifier implementation from native to java" am: 06eb53cede am: 6ff8cf84f7
am: 957fe88fc9 -s ours
am skip reason: change_id Ide5e58d1c80d9a028cea4e9192a91aeac2843c71 with SHA1 64c4cb2ea9 is in history

Change-Id: Id18ab25a7bcb4525bf9d43b8b553c5b0c6185a83