Merge "Add more modules in HugeModulesMap" am: 7c907b84e7

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2513635

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