diff --git a/Android.bp b/Android.bp
index d9e0694..b88f541 100644
--- a/Android.bp
+++ b/Android.bp
@@ -109,10 +109,7 @@
     host_supported: true,
     recovery_available: true,
     vendor_available: true,
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
+    double_loadable: true,
     target: {
         host: {
             exclude_shared_libs: [
diff --git a/modules/input/evdev/InputDevice.cpp b/modules/input/evdev/InputDevice.cpp
index a1bce64..1e3da58 100644
--- a/modules/input/evdev/InputDevice.cpp
+++ b/modules/input/evdev/InputDevice.cpp
@@ -24,7 +24,6 @@
 
 #include <linux/input.h>
 
-#define __STDC_FORMAT_MACROS
 #include <cinttypes>
 #include <cstdlib>
 #include <string>