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

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

Change-Id: Ib1e8445da3032d9433e5610bb96b34e2cb30b4e4