diff --git a/configstore/utils/Android.bp b/configstore/utils/Android.bp
index a4cad66..93e52f1 100644
--- a/configstore/utils/Android.bp
+++ b/configstore/utils/Android.bp
@@ -17,6 +17,9 @@
 cc_library_shared {
     name: "android.hardware.configstore-utils",
     vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
     defaults: ["hidl_defaults"],
 
     srcs: [ "ConfigStoreUtils.cpp" ],
diff --git a/tests/trie/1.0/types.hal b/tests/trie/1.0/types.hal
index 28c502b..c626909 100644
--- a/tests/trie/1.0/types.hal
+++ b/tests/trie/1.0/types.hal
@@ -16,16 +16,16 @@
 
 package android.hardware.tests.trie@1.0;
 
+struct TrieEdge {
+    int8_t character;
+    TrieNode node; // Requires reordering.
+};
+
 struct TrieNode {
     vec<TrieEdge> next;
     bool isTerminal;
 };
 
-struct TrieEdge {
-    int8_t character;
-    TrieNode node;
-};
-
 // Some forward reference tests.
 
 struct A {
@@ -41,11 +41,11 @@
     refS f;
 };
 
+enum E2 : E1 {
+    ACCEPT,
+};
+
 enum E1 : int32_t {
     OK = E2:ACCEPT + ANOTHER,
     ANOTHER = 100,
 };
-
-enum E2 : E1 {
-    ACCEPT,
-};