Remove duplicate paths in module definitionsHEADmastermain

Bug: 326674683
Test: m nothing with a soong change to error on duplicates
Change-Id: I1408d261b57fc6caee3dcf13ea7dcc890f42b83c

4 files changed, 0 insertions, 244 deletions

diff --git a/arm/Android.bp b/arm/Android.bp
index 30bbb81..defc36f 100644
--- a/arm/Android.bp
+++ b/arm/Android.bp
@@ -2344,7 +2344,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/hardware/interfaces/confirmationui/support/include",
-                "include/hardware/interfaces/confirmationui/support/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/android.hardware.confirmationui-support-lib.so"],
         },
@@ -6649,7 +6648,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/libhidl/transport/token/1.0/utils/include",
-                "include/system/libhidl/transport/token/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
                 "include/system/core/libcutils/include_vndk",
@@ -6862,7 +6860,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/deprecated-adf/libadf/include",
-                "include/system/core/deprecated-adf/libadf/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libadf.so"],
         },
@@ -6899,7 +6896,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/media/audio_utils/include",
-                "include/system/media/audio_utils/include",
                 "include/system/media/audio/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libutils/include",
@@ -6993,7 +6989,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/libcap/libcap/include",
-                "include/external/libcap/libcap/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcap.so"],
         },
@@ -7061,7 +7056,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/cn-cbor/include",
-                "include/external/cn-cbor/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcn-cbor.so"],
         },
@@ -7133,7 +7127,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libcrypto_utils/include",
-                "include/system/core/libcrypto_utils/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcrypto_utils.so"],
         },
@@ -7154,7 +7147,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/curl/include",
-                "include/external/curl/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libcurl.so"],
         },
@@ -7174,7 +7166,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libdiskconfig/include",
-                "include/system/core/libdiskconfig/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libdiskconfig.so"],
         },
@@ -7216,7 +7207,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/libevent/include",
-                "include/external/libevent/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libevent.so"],
         },
@@ -7257,7 +7247,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/expat/lib",
-                "include/external/expat/lib",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libexpat.so"],
         },
@@ -7277,7 +7266,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/libfmq/include",
-                "include/system/libfmq/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libprocessgroup/include",
                 "include/system/core/libcutils/include",
@@ -7324,7 +7312,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/frameworks/native/libs/gui/include",
-                "include/frameworks/native/libs/gui/include",
                 "include/system/libhidl/transport/token/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
@@ -7389,7 +7376,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/hardware/libhardware_legacy/include",
-                "include/hardware/libhardware_legacy/include",
                 "include/system/core/libcutils/include_vndk",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libhardware_legacy.so"],
@@ -7410,7 +7396,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/libhidl/transport/allocator/1.0/utils/include",
-                "include/system/libhidl/transport/allocator/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
                 "include/system/core/libcutils/include_vndk",
@@ -7449,7 +7434,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/libjpeg-turbo",
-                "include/external/libjpeg-turbo",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libjpeg.so"],
         },
@@ -7510,7 +7494,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/lz4/lib",
-                "include/external/lz4/lib",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/liblz4.so"],
         },
@@ -7694,7 +7677,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/libnl/include",
-                "include/external/libnl/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libnl.so"],
         },
@@ -7715,7 +7697,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/pcre/include",
-                "include/external/pcre/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpcre2.so"],
         },
@@ -7736,7 +7717,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/piex",
-                "include/external/piex",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpiex.so"],
         },
@@ -7757,7 +7737,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/libpng",
-                "include/external/libpng",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpng.so"],
         },
@@ -7778,7 +7757,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/hardware/libhardware_legacy/include",
-                "include/hardware/libhardware_legacy/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libpower.so"],
         },
@@ -7798,7 +7776,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libprocinfo/include",
-                "include/system/core/libprocinfo/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libprocinfo.so"],
         },
@@ -7859,7 +7836,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/sqlite/dist",
-                "include/external/sqlite/dist",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsqlite.so"],
         },
@@ -7880,7 +7856,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/boringssl/src/include",
-                "include/external/boringssl/src/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libssl.so"],
         },
@@ -7900,7 +7875,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/frameworks/av/media/bufferpool/2.0/include",
-                "include/frameworks/av/media/bufferpool/2.0/include",
                 "include/system/libfmq/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libprocessgroup/include",
@@ -8132,7 +8106,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libsysutils/include",
-                "include/system/core/libsysutils/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libsysutils.so"],
         },
@@ -8153,7 +8126,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/tinyalsa/include",
-                "include/external/tinyalsa/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyalsa.so"],
         },
@@ -8174,7 +8146,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/tinyxml2",
-                "include/external/tinyxml2",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libtinyxml2.so"],
         },
@@ -8248,7 +8219,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libusbhost/include",
-                "include/system/core/libusbhost/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libusbhost.so"],
         },
@@ -8268,7 +8238,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/frameworks/opt/net/wifi/libwifi_system_iface/include",
-                "include/frameworks/opt/net/wifi/libwifi_system_iface/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libwifi-system-iface.so"],
         },
@@ -8308,7 +8277,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/libyuv/files/include",
-                "include/external/libyuv/files/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-core/libyuv.so"],
         },
@@ -8328,7 +8296,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libziparchive/include",
-                "include/system/core/libziparchive/include",
                 "include/external/googletest/googletest/include",
                 "include/system/core/base/include",
                 "include/external/fmtlib/include",
@@ -9023,7 +8990,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/frameworks/native/libs/gralloc/types/include",
-                "include/frameworks/native/libs/gralloc/types/include",
                 "include/frameworks/native/libs/binder/ndk/include_ndk",
                 "include/frameworks/native/libs/binder/ndk/include_platform",
                 "include/generated-headers/hardware/interfaces/common/aidl/android.hardware.common-ndk_platform-source/gen/include",
@@ -9131,7 +9097,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/libhidl/libhidlmemory/include",
-                "include/system/libhidl/libhidlmemory/include",
                 "include/system/libhidl/base/include",
                 "include/system/libhidl/transport/include",
                 "include/system/libhwbinder/include",
@@ -9193,7 +9158,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/jsoncpp/include",
-                "include/external/jsoncpp/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libjsoncpp.so"],
         },
@@ -9214,7 +9178,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/lzma/C",
-                "include/external/lzma/C",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/liblzma.so"],
         },
@@ -9235,7 +9198,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libprocessgroup/include",
-                "include/system/core/libprocessgroup/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libprocessgroup.so"],
         },
@@ -9256,7 +9218,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libunwindstack/include",
-                "include/system/core/libunwindstack/include",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libunwindstack.so"],
         },
@@ -9330,7 +9291,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/zlib",
-                "include/external/zlib",
             ],
             srcs: ["arch-arm-armv7-a-neon/shared/vndk-sp/libz.so"],
         },
diff --git a/arm64/Android.bp b/arm64/Android.bp
index 1a63d13..a8535bf 100644
--- a/arm64/Android.bp
+++ b/arm64/Android.bp
@@ -3838,14 +3838,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/hardware/interfaces/confirmationui/support/include",
-                "include/hardware/interfaces/confirmationui/support/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/android.hardware.confirmationui-support-lib.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/hardware/interfaces/confirmationui/support/include",
-                "include/hardware/interfaces/confirmationui/support/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/android.hardware.confirmationui-support-lib.so"],
         },
@@ -10875,7 +10873,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/libhidl/transport/token/1.0/utils/include",
-                "include/system/libhidl/transport/token/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
                 "include/system/core/libcutils/include_vndk",
@@ -10899,7 +10896,6 @@ vndk_prebuilt_shared {
         arm64: {
             export_include_dirs: [
                 "include/system/libhidl/transport/token/1.0/utils/include",
-                "include/system/libhidl/transport/token/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
                 "include/system/core/libcutils/include_vndk",
@@ -11223,14 +11219,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/deprecated-adf/libadf/include",
-                "include/system/core/deprecated-adf/libadf/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libadf.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/system/core/deprecated-adf/libadf/include",
-                "include/system/core/deprecated-adf/libadf/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libadf.so"],
         },
@@ -11270,7 +11264,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/media/audio_utils/include",
-                "include/system/media/audio_utils/include",
                 "include/system/media/audio/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libutils/include",
@@ -11284,7 +11277,6 @@ vndk_prebuilt_shared {
         arm64: {
             export_include_dirs: [
                 "include/system/media/audio_utils/include",
-                "include/system/media/audio_utils/include",
                 "include/system/media/audio/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libutils/include",
@@ -11405,14 +11397,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/libcap/libcap/include",
-                "include/external/libcap/libcap/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcap.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/libcap/libcap/include",
-                "include/external/libcap/libcap/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libcap.so"],
         },
@@ -11528,14 +11518,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/cn-cbor/include",
-                "include/external/cn-cbor/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcn-cbor.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/cn-cbor/include",
-                "include/external/cn-cbor/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libcn-cbor.so"],
         },
@@ -11632,14 +11620,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libcrypto_utils/include",
-                "include/system/core/libcrypto_utils/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcrypto_utils.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/system/core/libcrypto_utils/include",
-                "include/system/core/libcrypto_utils/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libcrypto_utils.so"],
         },
@@ -11660,14 +11646,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/curl/include",
-                "include/external/curl/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libcurl.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/curl/include",
-                "include/external/curl/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libcurl.so"],
         },
@@ -11687,14 +11671,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libdiskconfig/include",
-                "include/system/core/libdiskconfig/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libdiskconfig.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/system/core/libdiskconfig/include",
-                "include/system/core/libdiskconfig/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libdiskconfig.so"],
         },
@@ -11744,14 +11726,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/libevent/include",
-                "include/external/libevent/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libevent.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/libevent/include",
-                "include/external/libevent/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libevent.so"],
         },
@@ -11798,14 +11778,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/expat/lib",
-                "include/external/expat/lib",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libexpat.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/expat/lib",
-                "include/external/expat/lib",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libexpat.so"],
         },
@@ -11825,7 +11803,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/libfmq/include",
-                "include/system/libfmq/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libprocessgroup/include",
                 "include/system/core/libcutils/include",
@@ -11839,7 +11816,6 @@ vndk_prebuilt_shared {
         arm64: {
             export_include_dirs: [
                 "include/system/libfmq/include",
-                "include/system/libfmq/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libprocessgroup/include",
                 "include/system/core/libcutils/include",
@@ -11892,7 +11868,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/frameworks/native/libs/gui/include",
-                "include/frameworks/native/libs/gui/include",
                 "include/system/libhidl/transport/token/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
@@ -11943,7 +11918,6 @@ vndk_prebuilt_shared {
         arm64: {
             export_include_dirs: [
                 "include/frameworks/native/libs/gui/include",
-                "include/frameworks/native/libs/gui/include",
                 "include/system/libhidl/transport/token/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
@@ -12008,7 +11982,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/hardware/libhardware_legacy/include",
-                "include/hardware/libhardware_legacy/include",
                 "include/system/core/libcutils/include_vndk",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libhardware_legacy.so"],
@@ -12016,7 +11989,6 @@ vndk_prebuilt_shared {
         arm64: {
             export_include_dirs: [
                 "include/hardware/libhardware_legacy/include",
-                "include/hardware/libhardware_legacy/include",
                 "include/system/core/libcutils/include_vndk",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libhardware_legacy.so"],
@@ -12037,7 +12009,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/libhidl/transport/allocator/1.0/utils/include",
-                "include/system/libhidl/transport/allocator/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
                 "include/system/core/libcutils/include_vndk",
@@ -12062,7 +12033,6 @@ vndk_prebuilt_shared {
         arm64: {
             export_include_dirs: [
                 "include/system/libhidl/transport/allocator/1.0/utils/include",
-                "include/system/libhidl/transport/allocator/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
                 "include/system/core/libcutils/include_vndk",
@@ -12101,14 +12071,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/libjpeg-turbo",
-                "include/external/libjpeg-turbo",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libjpeg.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/libjpeg-turbo",
-                "include/external/libjpeg-turbo",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libjpeg.so"],
         },
@@ -12181,14 +12149,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/lz4/lib",
-                "include/external/lz4/lib",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/liblz4.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/lz4/lib",
-                "include/external/lz4/lib",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/liblz4.so"],
         },
@@ -12454,14 +12420,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/libnl/include",
-                "include/external/libnl/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libnl.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/libnl/include",
-                "include/external/libnl/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libnl.so"],
         },
@@ -12482,14 +12446,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/pcre/include",
-                "include/external/pcre/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpcre2.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/pcre/include",
-                "include/external/pcre/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libpcre2.so"],
         },
@@ -12510,14 +12472,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/piex",
-                "include/external/piex",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpiex.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/piex",
-                "include/external/piex",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libpiex.so"],
         },
@@ -12538,14 +12498,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/libpng",
-                "include/external/libpng",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpng.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/libpng",
-                "include/external/libpng",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libpng.so"],
         },
@@ -12566,14 +12524,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/hardware/libhardware_legacy/include",
-                "include/hardware/libhardware_legacy/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libpower.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/hardware/libhardware_legacy/include",
-                "include/hardware/libhardware_legacy/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libpower.so"],
         },
@@ -12593,14 +12549,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libprocinfo/include",
-                "include/system/core/libprocinfo/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libprocinfo.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/system/core/libprocinfo/include",
-                "include/system/core/libprocinfo/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libprocinfo.so"],
         },
@@ -12674,14 +12628,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/sqlite/dist",
-                "include/external/sqlite/dist",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libsqlite.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/sqlite/dist",
-                "include/external/sqlite/dist",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libsqlite.so"],
         },
@@ -12702,14 +12654,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/boringssl/src/include",
-                "include/external/boringssl/src/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libssl.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/boringssl/src/include",
-                "include/external/boringssl/src/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libssl.so"],
         },
@@ -12729,7 +12679,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/frameworks/av/media/bufferpool/2.0/include",
-                "include/frameworks/av/media/bufferpool/2.0/include",
                 "include/system/libfmq/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libprocessgroup/include",
@@ -12754,7 +12703,6 @@ vndk_prebuilt_shared {
         arm64: {
             export_include_dirs: [
                 "include/frameworks/av/media/bufferpool/2.0/include",
-                "include/frameworks/av/media/bufferpool/2.0/include",
                 "include/system/libfmq/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libprocessgroup/include",
@@ -13112,14 +13060,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libsysutils/include",
-                "include/system/core/libsysutils/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libsysutils.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/system/core/libsysutils/include",
-                "include/system/core/libsysutils/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libsysutils.so"],
         },
@@ -13140,14 +13086,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/tinyalsa/include",
-                "include/external/tinyalsa/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libtinyalsa.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/tinyalsa/include",
-                "include/external/tinyalsa/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libtinyalsa.so"],
         },
@@ -13168,14 +13112,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/tinyxml2",
-                "include/external/tinyxml2",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libtinyxml2.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/tinyxml2",
-                "include/external/tinyxml2",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libtinyxml2.so"],
         },
@@ -13289,14 +13231,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libusbhost/include",
-                "include/system/core/libusbhost/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libusbhost.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/system/core/libusbhost/include",
-                "include/system/core/libusbhost/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libusbhost.so"],
         },
@@ -13316,14 +13256,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/frameworks/opt/net/wifi/libwifi_system_iface/include",
-                "include/frameworks/opt/net/wifi/libwifi_system_iface/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libwifi-system-iface.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/frameworks/opt/net/wifi/libwifi_system_iface/include",
-                "include/frameworks/opt/net/wifi/libwifi_system_iface/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libwifi-system-iface.so"],
         },
@@ -13369,14 +13307,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/libyuv/files/include",
-                "include/external/libyuv/files/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-core/libyuv.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/libyuv/files/include",
-                "include/external/libyuv/files/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-core/libyuv.so"],
         },
@@ -13396,7 +13332,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libziparchive/include",
-                "include/system/core/libziparchive/include",
                 "include/external/googletest/googletest/include",
                 "include/system/core/base/include",
                 "include/external/fmtlib/include",
@@ -13406,7 +13341,6 @@ vndk_prebuilt_shared {
         arm64: {
             export_include_dirs: [
                 "include/system/core/libziparchive/include",
-                "include/system/core/libziparchive/include",
                 "include/external/googletest/googletest/include",
                 "include/system/core/base/include",
                 "include/external/fmtlib/include",
@@ -14429,7 +14363,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/frameworks/native/libs/gralloc/types/include",
-                "include/frameworks/native/libs/gralloc/types/include",
                 "include/frameworks/native/libs/binder/ndk/include_ndk",
                 "include/frameworks/native/libs/binder/ndk/include_platform",
                 "include/generated-headers/hardware/interfaces/common/aidl/android.hardware.common-ndk_platform-source/gen/include",
@@ -14460,7 +14393,6 @@ vndk_prebuilt_shared {
         arm64: {
             export_include_dirs: [
                 "include/frameworks/native/libs/gralloc/types/include",
-                "include/frameworks/native/libs/gralloc/types/include",
                 "include/frameworks/native/libs/binder/ndk/include_ndk",
                 "include/frameworks/native/libs/binder/ndk/include_platform",
                 "include/generated-headers/hardware/interfaces/common/aidl/android.hardware.common-ndk_platform-source/gen/include",
@@ -14601,7 +14533,6 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/libhidl/libhidlmemory/include",
-                "include/system/libhidl/libhidlmemory/include",
                 "include/system/libhidl/base/include",
                 "include/system/libhidl/transport/include",
                 "include/system/libhwbinder/include",
@@ -14626,7 +14557,6 @@ vndk_prebuilt_shared {
         arm64: {
             export_include_dirs: [
                 "include/system/libhidl/libhidlmemory/include",
-                "include/system/libhidl/libhidlmemory/include",
                 "include/system/libhidl/base/include",
                 "include/system/libhidl/transport/include",
                 "include/system/libhwbinder/include",
@@ -14697,14 +14627,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/jsoncpp/include",
-                "include/external/jsoncpp/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libjsoncpp.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/jsoncpp/include",
-                "include/external/jsoncpp/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-sp/libjsoncpp.so"],
         },
@@ -14725,14 +14653,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/lzma/C",
-                "include/external/lzma/C",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/liblzma.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/lzma/C",
-                "include/external/lzma/C",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-sp/liblzma.so"],
         },
@@ -14753,14 +14679,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libprocessgroup/include",
-                "include/system/core/libprocessgroup/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libprocessgroup.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/system/core/libprocessgroup/include",
-                "include/system/core/libprocessgroup/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-sp/libprocessgroup.so"],
         },
@@ -14781,14 +14705,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/system/core/libunwindstack/include",
-                "include/system/core/libunwindstack/include",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libunwindstack.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/system/core/libunwindstack/include",
-                "include/system/core/libunwindstack/include",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-sp/libunwindstack.so"],
         },
@@ -14884,14 +14806,12 @@ vndk_prebuilt_shared {
         arm: {
             export_include_dirs: [
                 "include/external/zlib",
-                "include/external/zlib",
             ],
             srcs: ["arch-arm-armv8-a/shared/vndk-sp/libz.so"],
         },
         arm64: {
             export_include_dirs: [
                 "include/external/zlib",
-                "include/external/zlib",
             ],
             srcs: ["arch-arm64-armv8-a/shared/vndk-sp/libz.so"],
         },
diff --git a/x86/Android.bp b/x86/Android.bp
index 3f52cab..2d5afd4 100644
--- a/x86/Android.bp
+++ b/x86/Android.bp
@@ -2344,7 +2344,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/hardware/interfaces/confirmationui/support/include",
-                "include/hardware/interfaces/confirmationui/support/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/android.hardware.confirmationui-support-lib.so"],
         },
@@ -6649,7 +6648,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/libhidl/transport/token/1.0/utils/include",
-                "include/system/libhidl/transport/token/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
                 "include/system/core/libcutils/include_vndk",
@@ -6862,7 +6860,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/deprecated-adf/libadf/include",
-                "include/system/core/deprecated-adf/libadf/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libadf.so"],
         },
@@ -6899,7 +6896,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/media/audio_utils/include",
-                "include/system/media/audio_utils/include",
                 "include/system/media/audio/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libutils/include",
@@ -6993,7 +6989,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/libcap/libcap/include",
-                "include/external/libcap/libcap/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libcap.so"],
         },
@@ -7061,7 +7056,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/cn-cbor/include",
-                "include/external/cn-cbor/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libcn-cbor.so"],
         },
@@ -7133,7 +7127,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libcrypto_utils/include",
-                "include/system/core/libcrypto_utils/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libcrypto_utils.so"],
         },
@@ -7154,7 +7147,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/curl/include",
-                "include/external/curl/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libcurl.so"],
         },
@@ -7174,7 +7166,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libdiskconfig/include",
-                "include/system/core/libdiskconfig/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libdiskconfig.so"],
         },
@@ -7216,7 +7207,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/libevent/include",
-                "include/external/libevent/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libevent.so"],
         },
@@ -7257,7 +7247,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/expat/lib",
-                "include/external/expat/lib",
             ],
             srcs: ["arch-x86/shared/vndk-core/libexpat.so"],
         },
@@ -7277,7 +7266,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/libfmq/include",
-                "include/system/libfmq/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libprocessgroup/include",
                 "include/system/core/libcutils/include",
@@ -7324,7 +7312,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/frameworks/native/libs/gui/include",
-                "include/frameworks/native/libs/gui/include",
                 "include/system/libhidl/transport/token/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
@@ -7389,7 +7376,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/hardware/libhardware_legacy/include",
-                "include/hardware/libhardware_legacy/include",
                 "include/system/core/libcutils/include_vndk",
             ],
             srcs: ["arch-x86/shared/vndk-core/libhardware_legacy.so"],
@@ -7410,7 +7396,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/libhidl/transport/allocator/1.0/utils/include",
-                "include/system/libhidl/transport/allocator/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
                 "include/system/core/libcutils/include_vndk",
@@ -7449,7 +7434,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/libjpeg-turbo",
-                "include/external/libjpeg-turbo",
             ],
             srcs: ["arch-x86/shared/vndk-core/libjpeg.so"],
         },
@@ -7510,7 +7494,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/lz4/lib",
-                "include/external/lz4/lib",
             ],
             srcs: ["arch-x86/shared/vndk-core/liblz4.so"],
         },
@@ -7694,7 +7677,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/libnl/include",
-                "include/external/libnl/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libnl.so"],
         },
@@ -7715,7 +7697,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/pcre/include",
-                "include/external/pcre/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libpcre2.so"],
         },
@@ -7736,7 +7717,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/piex",
-                "include/external/piex",
             ],
             srcs: ["arch-x86/shared/vndk-core/libpiex.so"],
         },
@@ -7757,7 +7737,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/libpng",
-                "include/external/libpng",
             ],
             srcs: ["arch-x86/shared/vndk-core/libpng.so"],
         },
@@ -7778,7 +7757,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/hardware/libhardware_legacy/include",
-                "include/hardware/libhardware_legacy/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libpower.so"],
         },
@@ -7798,7 +7776,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libprocinfo/include",
-                "include/system/core/libprocinfo/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libprocinfo.so"],
         },
@@ -7859,7 +7836,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/sqlite/dist",
-                "include/external/sqlite/dist",
             ],
             srcs: ["arch-x86/shared/vndk-core/libsqlite.so"],
         },
@@ -7880,7 +7856,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/boringssl/src/include",
-                "include/external/boringssl/src/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libssl.so"],
         },
@@ -7900,7 +7875,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/frameworks/av/media/bufferpool/2.0/include",
-                "include/frameworks/av/media/bufferpool/2.0/include",
                 "include/system/libfmq/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libprocessgroup/include",
@@ -8132,7 +8106,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libsysutils/include",
-                "include/system/core/libsysutils/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libsysutils.so"],
         },
@@ -8153,7 +8126,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/tinyalsa/include",
-                "include/external/tinyalsa/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libtinyalsa.so"],
         },
@@ -8174,7 +8146,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/tinyxml2",
-                "include/external/tinyxml2",
             ],
             srcs: ["arch-x86/shared/vndk-core/libtinyxml2.so"],
         },
@@ -8248,7 +8219,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libusbhost/include",
-                "include/system/core/libusbhost/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libusbhost.so"],
         },
@@ -8268,7 +8238,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/frameworks/opt/net/wifi/libwifi_system_iface/include",
-                "include/frameworks/opt/net/wifi/libwifi_system_iface/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libwifi-system-iface.so"],
         },
@@ -8308,7 +8277,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/libyuv/files/include",
-                "include/external/libyuv/files/include",
             ],
             srcs: ["arch-x86/shared/vndk-core/libyuv.so"],
         },
@@ -8328,7 +8296,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libziparchive/include",
-                "include/system/core/libziparchive/include",
                 "include/external/googletest/googletest/include",
                 "include/system/core/base/include",
                 "include/external/fmtlib/include",
@@ -9023,7 +8990,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/frameworks/native/libs/gralloc/types/include",
-                "include/frameworks/native/libs/gralloc/types/include",
                 "include/frameworks/native/libs/binder/ndk/include_ndk",
                 "include/frameworks/native/libs/binder/ndk/include_platform",
                 "include/generated-headers/hardware/interfaces/common/aidl/android.hardware.common-ndk_platform-source/gen/include",
@@ -9131,7 +9097,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/libhidl/libhidlmemory/include",
-                "include/system/libhidl/libhidlmemory/include",
                 "include/system/libhidl/base/include",
                 "include/system/libhidl/transport/include",
                 "include/system/libhwbinder/include",
@@ -9193,7 +9158,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/jsoncpp/include",
-                "include/external/jsoncpp/include",
             ],
             srcs: ["arch-x86/shared/vndk-sp/libjsoncpp.so"],
         },
@@ -9214,7 +9178,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/lzma/C",
-                "include/external/lzma/C",
             ],
             srcs: ["arch-x86/shared/vndk-sp/liblzma.so"],
         },
@@ -9235,7 +9198,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libprocessgroup/include",
-                "include/system/core/libprocessgroup/include",
             ],
             srcs: ["arch-x86/shared/vndk-sp/libprocessgroup.so"],
         },
@@ -9256,7 +9218,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libunwindstack/include",
-                "include/system/core/libunwindstack/include",
             ],
             srcs: ["arch-x86/shared/vndk-sp/libunwindstack.so"],
         },
@@ -9330,7 +9291,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/zlib",
-                "include/external/zlib",
             ],
             srcs: ["arch-x86/shared/vndk-sp/libz.so"],
         },
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
index 21f877c..b8d8ffa 100644
--- a/x86_64/Android.bp
+++ b/x86_64/Android.bp
@@ -3838,14 +3838,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/hardware/interfaces/confirmationui/support/include",
-                "include/hardware/interfaces/confirmationui/support/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/android.hardware.confirmationui-support-lib.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/hardware/interfaces/confirmationui/support/include",
-                "include/hardware/interfaces/confirmationui/support/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/android.hardware.confirmationui-support-lib.so"],
         },
@@ -10875,7 +10873,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/libhidl/transport/token/1.0/utils/include",
-                "include/system/libhidl/transport/token/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
                 "include/system/core/libcutils/include_vndk",
@@ -10899,7 +10896,6 @@ vndk_prebuilt_shared {
         x86_64: {
             export_include_dirs: [
                 "include/system/libhidl/transport/token/1.0/utils/include",
-                "include/system/libhidl/transport/token/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
                 "include/system/core/libcutils/include_vndk",
@@ -11223,14 +11219,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/deprecated-adf/libadf/include",
-                "include/system/core/deprecated-adf/libadf/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libadf.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/system/core/deprecated-adf/libadf/include",
-                "include/system/core/deprecated-adf/libadf/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libadf.so"],
         },
@@ -11270,7 +11264,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/media/audio_utils/include",
-                "include/system/media/audio_utils/include",
                 "include/system/media/audio/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libutils/include",
@@ -11284,7 +11277,6 @@ vndk_prebuilt_shared {
         x86_64: {
             export_include_dirs: [
                 "include/system/media/audio_utils/include",
-                "include/system/media/audio_utils/include",
                 "include/system/media/audio/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libutils/include",
@@ -11405,14 +11397,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/libcap/libcap/include",
-                "include/external/libcap/libcap/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcap.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/libcap/libcap/include",
-                "include/external/libcap/libcap/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libcap.so"],
         },
@@ -11528,14 +11518,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/cn-cbor/include",
-                "include/external/cn-cbor/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcn-cbor.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/cn-cbor/include",
-                "include/external/cn-cbor/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libcn-cbor.so"],
         },
@@ -11632,14 +11620,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libcrypto_utils/include",
-                "include/system/core/libcrypto_utils/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcrypto_utils.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/system/core/libcrypto_utils/include",
-                "include/system/core/libcrypto_utils/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libcrypto_utils.so"],
         },
@@ -11660,14 +11646,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/curl/include",
-                "include/external/curl/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libcurl.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/curl/include",
-                "include/external/curl/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libcurl.so"],
         },
@@ -11687,14 +11671,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libdiskconfig/include",
-                "include/system/core/libdiskconfig/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libdiskconfig.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/system/core/libdiskconfig/include",
-                "include/system/core/libdiskconfig/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libdiskconfig.so"],
         },
@@ -11744,14 +11726,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/libevent/include",
-                "include/external/libevent/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libevent.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/libevent/include",
-                "include/external/libevent/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libevent.so"],
         },
@@ -11798,14 +11778,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/expat/lib",
-                "include/external/expat/lib",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libexpat.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/expat/lib",
-                "include/external/expat/lib",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libexpat.so"],
         },
@@ -11825,7 +11803,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/libfmq/include",
-                "include/system/libfmq/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libprocessgroup/include",
                 "include/system/core/libcutils/include",
@@ -11839,7 +11816,6 @@ vndk_prebuilt_shared {
         x86_64: {
             export_include_dirs: [
                 "include/system/libfmq/include",
-                "include/system/libfmq/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libprocessgroup/include",
                 "include/system/core/libcutils/include",
@@ -11892,7 +11868,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/frameworks/native/libs/gui/include",
-                "include/frameworks/native/libs/gui/include",
                 "include/system/libhidl/transport/token/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
@@ -11943,7 +11918,6 @@ vndk_prebuilt_shared {
         x86_64: {
             export_include_dirs: [
                 "include/frameworks/native/libs/gui/include",
-                "include/frameworks/native/libs/gui/include",
                 "include/system/libhidl/transport/token/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
@@ -12008,7 +11982,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/hardware/libhardware_legacy/include",
-                "include/hardware/libhardware_legacy/include",
                 "include/system/core/libcutils/include_vndk",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libhardware_legacy.so"],
@@ -12016,7 +11989,6 @@ vndk_prebuilt_shared {
         x86_64: {
             export_include_dirs: [
                 "include/hardware/libhardware_legacy/include",
-                "include/hardware/libhardware_legacy/include",
                 "include/system/core/libcutils/include_vndk",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libhardware_legacy.so"],
@@ -12037,7 +12009,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/libhidl/transport/allocator/1.0/utils/include",
-                "include/system/libhidl/transport/allocator/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
                 "include/system/core/libcutils/include_vndk",
@@ -12062,7 +12033,6 @@ vndk_prebuilt_shared {
         x86_64: {
             export_include_dirs: [
                 "include/system/libhidl/transport/allocator/1.0/utils/include",
-                "include/system/libhidl/transport/allocator/1.0/utils/include",
                 "include/frameworks/native/libs/binder/include",
                 "include/system/core/base/include",
                 "include/system/core/libcutils/include_vndk",
@@ -12101,14 +12071,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/libjpeg-turbo",
-                "include/external/libjpeg-turbo",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libjpeg.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/libjpeg-turbo",
-                "include/external/libjpeg-turbo",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libjpeg.so"],
         },
@@ -12181,14 +12149,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/lz4/lib",
-                "include/external/lz4/lib",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/liblz4.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/lz4/lib",
-                "include/external/lz4/lib",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/liblz4.so"],
         },
@@ -12454,14 +12420,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/libnl/include",
-                "include/external/libnl/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libnl.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/libnl/include",
-                "include/external/libnl/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libnl.so"],
         },
@@ -12482,14 +12446,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/pcre/include",
-                "include/external/pcre/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpcre2.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/pcre/include",
-                "include/external/pcre/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libpcre2.so"],
         },
@@ -12510,14 +12472,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/piex",
-                "include/external/piex",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpiex.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/piex",
-                "include/external/piex",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libpiex.so"],
         },
@@ -12538,14 +12498,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/libpng",
-                "include/external/libpng",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpng.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/libpng",
-                "include/external/libpng",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libpng.so"],
         },
@@ -12566,14 +12524,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/hardware/libhardware_legacy/include",
-                "include/hardware/libhardware_legacy/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libpower.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/hardware/libhardware_legacy/include",
-                "include/hardware/libhardware_legacy/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libpower.so"],
         },
@@ -12593,14 +12549,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libprocinfo/include",
-                "include/system/core/libprocinfo/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libprocinfo.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/system/core/libprocinfo/include",
-                "include/system/core/libprocinfo/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libprocinfo.so"],
         },
@@ -12674,14 +12628,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/sqlite/dist",
-                "include/external/sqlite/dist",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libsqlite.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/sqlite/dist",
-                "include/external/sqlite/dist",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libsqlite.so"],
         },
@@ -12702,14 +12654,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/boringssl/src/include",
-                "include/external/boringssl/src/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libssl.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/boringssl/src/include",
-                "include/external/boringssl/src/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libssl.so"],
         },
@@ -12729,7 +12679,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/frameworks/av/media/bufferpool/2.0/include",
-                "include/frameworks/av/media/bufferpool/2.0/include",
                 "include/system/libfmq/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libprocessgroup/include",
@@ -12754,7 +12703,6 @@ vndk_prebuilt_shared {
         x86_64: {
             export_include_dirs: [
                 "include/frameworks/av/media/bufferpool/2.0/include",
-                "include/frameworks/av/media/bufferpool/2.0/include",
                 "include/system/libfmq/include",
                 "include/system/core/libcutils/include_vndk",
                 "include/system/core/libprocessgroup/include",
@@ -13112,14 +13060,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libsysutils/include",
-                "include/system/core/libsysutils/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libsysutils.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/system/core/libsysutils/include",
-                "include/system/core/libsysutils/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libsysutils.so"],
         },
@@ -13140,14 +13086,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/tinyalsa/include",
-                "include/external/tinyalsa/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libtinyalsa.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/tinyalsa/include",
-                "include/external/tinyalsa/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libtinyalsa.so"],
         },
@@ -13168,14 +13112,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/tinyxml2",
-                "include/external/tinyxml2",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libtinyxml2.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/tinyxml2",
-                "include/external/tinyxml2",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libtinyxml2.so"],
         },
@@ -13289,14 +13231,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libusbhost/include",
-                "include/system/core/libusbhost/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libusbhost.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/system/core/libusbhost/include",
-                "include/system/core/libusbhost/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libusbhost.so"],
         },
@@ -13316,14 +13256,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/frameworks/opt/net/wifi/libwifi_system_iface/include",
-                "include/frameworks/opt/net/wifi/libwifi_system_iface/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libwifi-system-iface.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/frameworks/opt/net/wifi/libwifi_system_iface/include",
-                "include/frameworks/opt/net/wifi/libwifi_system_iface/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libwifi-system-iface.so"],
         },
@@ -13369,14 +13307,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/libyuv/files/include",
-                "include/external/libyuv/files/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-core/libyuv.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/libyuv/files/include",
-                "include/external/libyuv/files/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-core/libyuv.so"],
         },
@@ -13396,7 +13332,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libziparchive/include",
-                "include/system/core/libziparchive/include",
                 "include/external/googletest/googletest/include",
                 "include/system/core/base/include",
                 "include/external/fmtlib/include",
@@ -13406,7 +13341,6 @@ vndk_prebuilt_shared {
         x86_64: {
             export_include_dirs: [
                 "include/system/core/libziparchive/include",
-                "include/system/core/libziparchive/include",
                 "include/external/googletest/googletest/include",
                 "include/system/core/base/include",
                 "include/external/fmtlib/include",
@@ -14429,7 +14363,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/frameworks/native/libs/gralloc/types/include",
-                "include/frameworks/native/libs/gralloc/types/include",
                 "include/frameworks/native/libs/binder/ndk/include_ndk",
                 "include/frameworks/native/libs/binder/ndk/include_platform",
                 "include/generated-headers/hardware/interfaces/common/aidl/android.hardware.common-ndk_platform-source/gen/include",
@@ -14460,7 +14393,6 @@ vndk_prebuilt_shared {
         x86_64: {
             export_include_dirs: [
                 "include/frameworks/native/libs/gralloc/types/include",
-                "include/frameworks/native/libs/gralloc/types/include",
                 "include/frameworks/native/libs/binder/ndk/include_ndk",
                 "include/frameworks/native/libs/binder/ndk/include_platform",
                 "include/generated-headers/hardware/interfaces/common/aidl/android.hardware.common-ndk_platform-source/gen/include",
@@ -14542,8 +14474,6 @@ vndk_prebuilt_shared {
             export_include_dirs: [
                 "include/system/libhidl/base/include",
                 "include/system/libhidl/transport/include",
-                "include/system/libhidl/base/include",
-                "include/system/libhidl/transport/include",
                 "include/system/libhwbinder/include",
                 "include/system/core/base/include",
                 "include/external/fmtlib/include",
@@ -14565,8 +14495,6 @@ vndk_prebuilt_shared {
             export_include_dirs: [
                 "include/system/libhidl/base/include",
                 "include/system/libhidl/transport/include",
-                "include/system/libhidl/base/include",
-                "include/system/libhidl/transport/include",
                 "include/system/libhwbinder/include",
                 "include/system/core/base/include",
                 "include/external/fmtlib/include",
@@ -14601,7 +14529,6 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/libhidl/libhidlmemory/include",
-                "include/system/libhidl/libhidlmemory/include",
                 "include/system/libhidl/base/include",
                 "include/system/libhidl/transport/include",
                 "include/system/libhwbinder/include",
@@ -14626,7 +14553,6 @@ vndk_prebuilt_shared {
         x86_64: {
             export_include_dirs: [
                 "include/system/libhidl/libhidlmemory/include",
-                "include/system/libhidl/libhidlmemory/include",
                 "include/system/libhidl/base/include",
                 "include/system/libhidl/transport/include",
                 "include/system/libhwbinder/include",
@@ -14697,14 +14623,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/jsoncpp/include",
-                "include/external/jsoncpp/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libjsoncpp.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/jsoncpp/include",
-                "include/external/jsoncpp/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-sp/libjsoncpp.so"],
         },
@@ -14725,14 +14649,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/lzma/C",
-                "include/external/lzma/C",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-sp/liblzma.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/lzma/C",
-                "include/external/lzma/C",
             ],
             srcs: ["arch-x86_64/shared/vndk-sp/liblzma.so"],
         },
@@ -14753,14 +14675,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libprocessgroup/include",
-                "include/system/core/libprocessgroup/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libprocessgroup.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/system/core/libprocessgroup/include",
-                "include/system/core/libprocessgroup/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-sp/libprocessgroup.so"],
         },
@@ -14781,14 +14701,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/system/core/libunwindstack/include",
-                "include/system/core/libunwindstack/include",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libunwindstack.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/system/core/libunwindstack/include",
-                "include/system/core/libunwindstack/include",
             ],
             srcs: ["arch-x86_64/shared/vndk-sp/libunwindstack.so"],
         },
@@ -14884,14 +14802,12 @@ vndk_prebuilt_shared {
         x86: {
             export_include_dirs: [
                 "include/external/zlib",
-                "include/external/zlib",
             ],
             srcs: ["arch-x86-x86_64/shared/vndk-sp/libz.so"],
         },
         x86_64: {
             export_include_dirs: [
                 "include/external/zlib",
-                "include/external/zlib",
             ],
             srcs: ["arch-x86_64/shared/vndk-sp/libz.so"],
         },