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: Ic80fb5c1f1e4ca21f1d2bbc45c401e547864906e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>