diff --git a/ndk/samples/native-activity/jni/main.c b/ndk/samples/native-activity/jni/main.c
index 83f55a90f..4807fd95b 100644
--- a/ndk/samples/native-activity/jni/main.c
+++ b/ndk/samples/native-activity/jni/main.c
@@ -136,7 +136,7 @@ static int engine_do_ui_event(struct engine* engine) {
         if (AInputQueue_preDispatchEvent(engine->app->inputQueue, event)) {
             return 1;
         }
-        if (AInputEvent_getType(event) == INPUT_EVENT_TYPE_MOTION) {
+        if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION) {
             engine->animating = 1;
             engine->x = AMotionEvent_getX(event, 0);
             engine->y = AMotionEvent_getY(event, 0);
diff --git a/ndk/samples/native-plasma/jni/plasma.c b/ndk/samples/native-plasma/jni/plasma.c
index 90d6bd7cf..6cf8b8e2c 100644
--- a/ndk/samples/native-plasma/jni/plasma.c
+++ b/ndk/samples/native-plasma/jni/plasma.c
@@ -417,10 +417,10 @@ static int engine_do_ui_event(struct engine* engine) {
         if (AInputQueue_preDispatchEvent(engine->app->inputQueue, event)) {
             return 1;
         }
-        if (AInputEvent_getType(event) == INPUT_EVENT_TYPE_MOTION) {
+        if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION) {
             engine->animating = 1;
             AInputQueue_finishEvent(engine->app->inputQueue, event, 1);
-        } else if (AInputEvent_getType(event) == INPUT_EVENT_TYPE_KEY) {
+        } else if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_KEY) {
             LOGI("Key event: action=%d keyCode=%d metaState=0x%x",
                     AKeyEvent_getAction(event),
                     AKeyEvent_getKeyCode(event),
diff --git a/ndk/samples/test-libstdc++/jni/Android.mk b/ndk/samples/test-libstdc++/jni/Android.mk
index 1cf376ca0..ba83acf0c 100644
--- a/ndk/samples/test-libstdc++/jni/Android.mk
+++ b/ndk/samples/test-libstdc++/jni/Android.mk
@@ -6,7 +6,4 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := test-libstl
 LOCAL_SRC_FILES := test-libstl.cpp
-LOCAL_STATIC_LIBRARIES := libstdc++
 include $(BUILD_EXECUTABLE)
-
-include $(NDK_ROOT)/sources/cpp-stl/minimal/Android.mk
diff --git a/ndk/samples/test-libstdc++/jni/test-libstl.cpp b/ndk/samples/test-libstdc++/jni/test-libstl.cpp
index f5d12625c..f9cedb0e6 100644
--- a/ndk/samples/test-libstdc++/jni/test-libstl.cpp
+++ b/ndk/samples/test-libstdc++/jni/test-libstl.cpp
@@ -1,3 +1,8 @@
 #include <cerrno>
 #include <cstddef>
 
+int main(void)
+{
+    return 0;
+}
+