Merge "Remove android.frameworks.bufferhub@1.0 from HIDL"
diff --git a/cameraservice/vts/functional/OWNERS b/cameraservice/vts/functional/OWNERS
index f48a95c..d1d18b4 100644
--- a/cameraservice/vts/functional/OWNERS
+++ b/cameraservice/vts/functional/OWNERS
@@ -1 +1,2 @@
+# Bug component: 41727
include platform/frameworks/av:/camera/OWNERS
diff --git a/stats/aidl/test_client/Android.bp b/stats/aidl/test_client/Android.bp
index c2afd6f..8a8c895 100644
--- a/stats/aidl/test_client/Android.bp
+++ b/stats/aidl/test_client/Android.bp
@@ -31,7 +31,7 @@
"AidlStatsClient.cpp",
],
shared_libs: [
- "android.frameworks.stats-V1-ndk_platform",
+ "android.frameworks.stats-V1-ndk",
"libbase",
"libbinder_ndk",
"libutils",
diff --git a/stats/aidl/vts/functional/Android.bp b/stats/aidl/vts/functional/Android.bp
index e0663bd..3a63bb0 100644
--- a/stats/aidl/vts/functional/Android.bp
+++ b/stats/aidl/vts/functional/Android.bp
@@ -32,7 +32,7 @@
"libvndksupport",
],
static_libs: [
- "android.frameworks.stats-V1-ndk_platform",
+ "android.frameworks.stats-V1-ndk",
],
test_suites: [
"general-tests",