Merge "Avoid duplicated module name for vndk_prebuilt_shared"