diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index fc5efc6..7a8d1a1 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -11,6 +11,7 @@
                libs/input/
                services/core/jni/
                services/incremental/
+               tools/
 
 [Hook Scripts]
 checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
diff --git a/tools/validatekeymaps/Main.cpp b/tools/validatekeymaps/Main.cpp
index 7c150f9..0af6266 100644
--- a/tools/validatekeymaps/Main.cpp
+++ b/tools/validatekeymaps/Main.cpp
@@ -115,13 +115,13 @@
     }
 
     case FILETYPE_INPUTDEVICECONFIGURATION: {
-        PropertyMap* map;
-        status_t status = PropertyMap::load(String8(filename), &map);
-        if (status) {
-            error("Error %d parsing input device configuration file.\n\n", status);
+        android::base::Result<std::unique_ptr<PropertyMap>> propertyMap =
+                PropertyMap::load(String8(filename));
+        if (!propertyMap.ok()) {
+            error("Error %d parsing input device configuration file.\n\n",
+                  propertyMap.error().code());
             return false;
         }
-        delete map;
         break;
     }