Merge "Avoid duplicated module name for vndk_prebuilt_shared" am: 9ad7ca0281 am: 978343d3b1

Original change: https://android-review.googlesource.com/c/platform/development/+/2031883

Change-Id: I05d57b0bcf086d6d4363725be335c4f83318e408