diff --git a/ndk/platforms/android-3/include/locale.h b/ndk/platforms/android-3/include/locale.h
index df4292172..4259ddda7 100644
--- a/ndk/platforms/android-3/include/locale.h
+++ b/ndk/platforms/android-3/include/locale.h
@@ -51,9 +51,8 @@ enum {
 
 extern char *setlocale(int category, const char *locale);
 
-/* Make libstdc++-v3 happy.  */
+#if 1 /* MISSING FROM BIONIC - DEFINED TO MAKE libstdc++-v3 happy */
 struct lconv { };
-#if 0 /* MISSING FROM BIONIC */
 struct lconv *localeconv(void);
 #endif /* MISSING */
 
diff --git a/ndk/platforms/android-9/include/android/native_window.h b/ndk/platforms/android-9/include/android/native_window.h
index ad03d0e93..f3d75507c 100644
--- a/ndk/platforms/android-9/include/android/native_window.h
+++ b/ndk/platforms/android-9/include/android/native_window.h
@@ -96,7 +96,7 @@ int32_t ANativeWindow_getFormat(ANativeWindow* window);
  * For all of these parameters, if 0 is supplied then the window's base
  * value will come back in force.
  */
-int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width, int32_t height);
+int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width, int32_t height, int32_t format);
 
 /**
  * Lock the window's next drawing surface for writing.