diff --git a/jni/resetprop/Android.mk b/jni/resetprop/Android.mk
index e3c49bd9a..047655788 100644
--- a/jni/resetprop/Android.mk
+++ b/jni/resetprop/Android.mk
@@ -4,4 +4,5 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := resetprop
 LOCAL_SRC_FILES := resetprop.cpp system_properties.cpp libc_logging.cpp
 LOCAL_LDLIBS += -latomic
+LOCAL_CFLAGS := -Wno-implicit-exception-spec-mismatch
 include $(BUILD_EXECUTABLE)
diff --git a/jni/selinux b/jni/selinux
index d7c6efa17..d2f80c3bc 160000
--- a/jni/selinux
+++ b/jni/selinux
@@ -1 +1 @@
-Subproject commit d7c6efa178620474c0de1d5caefb991a94c537c5
+Subproject commit d2f80c3bcc095526855d97d9202da2158fbced5c