Merge "Don't use module names with "prebuilt_" prefixes in make dependencies."...

Merge "Don't use module names with "prebuilt_" prefixes in make dependencies." am: d348c41a am: 00fd1c09 am: 83d5ddd5

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

Change-Id: I26aa94c752c941532290ac69eb6229cbac907c4b