[automerger skipped] Merge "Correct link type for module stubs" am: 4f3dc39a...

[automerger skipped] Merge "Correct link type for module stubs" am: 4f3dc39a am: 0b25319e -s ours am: 382d063d -s ours

am skip reason: Change-Id I49b9082dc1b5afe6c22e94126e574dd8061f0f39 with SHA-1 0bd88d0b is in history

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

Change-Id: I0fea9e5a0dc2825d2170039dc16512fea2018700