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: 542f97eb

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



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