Merge "Revert "Better partitioning module/non-module libraries"" into udc-dev am: 5bc9c86e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/22887297



Change-Id: Iaaae0f36e519c57c579b6a7782b2ac4065321679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>