Merge "Save approx 18GB of RAM by not having a bazillion copies of the same...

Merge "Save approx 18GB of RAM by not having a bazillion copies of the same modules names" into udc-dev am: c28fb442 am: c00314fe

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22957520



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