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

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



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