Merge "Revert "Update module configs for native tests"" into stage-aosp-master am: 77e5e549c2 am: d47955a242 am: 593b3b6002 am: be3dd6d1b9

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libtextclassifier/+/16192131

Change-Id: Ida2809ec280e597e88c640ee8aeeded059cd6842