Merge "Better partitioning module/non-module libraries" into udc-dev am: ad065b76

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



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