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

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

Change-Id: I11ec10df51ded4e14ef3bd20e8eb1f7200e25644