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