Merge "Revert "Better partitioning module/non-module libraries"" into udc-dev...

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

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



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