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

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

Change-Id: Iaf182ba26723d40b266e22cc9538779c5f184b6f