Merge "Fix the names of the dynamically inherited modules." am: fd8f0ffee0

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

Change-Id: I1b6f99eec33a776d307c8dec52360df8b6a0ee71