Update for improved glue.

Change-Id: I73bb23644523e8ec19c51a3e3b9c5c4f7a98c558
diff --git a/ndk/platforms/android-9/arch-arm/usr/include/android_glue/threaded_app.h b/ndk/platforms/android-9/arch-arm/usr/include/android_glue/threaded_app.h
index 491389b..adfdbea 100644
--- a/ndk/platforms/android-9/arch-arm/usr/include/android_glue/threaded_app.h
+++ b/ndk/platforms/android-9/arch-arm/usr/include/android_glue/threaded_app.h
@@ -144,12 +144,6 @@
 };
 
 /**
- * Call if android_app->destroyRequested is non-zero.  Upon return, the
- * android_app structure is no longer valid and must not be touched.
- */
-void android_app_destroy(struct android_app* android_app);
-
-/**
  * Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next
  * app command message.
  */
diff --git a/ndk/platforms/android-9/arch-arm/usr/lib/libthreaded_app.a b/ndk/platforms/android-9/arch-arm/usr/lib/libthreaded_app.a
index a21c7e5..6c6589f 100644
--- a/ndk/platforms/android-9/arch-arm/usr/lib/libthreaded_app.a
+++ b/ndk/platforms/android-9/arch-arm/usr/lib/libthreaded_app.a
Binary files differ
diff --git a/ndk/samples/native-activity/jni/Android.mk b/ndk/samples/native-activity/jni/Android.mk
index 8ce70aa..b1afdf5 100644
--- a/ndk/samples/native-activity/jni/Android.mk
+++ b/ndk/samples/native-activity/jni/Android.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 The Android Open Source Project
+# Copyright (C) 2010 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/ndk/samples/native-activity/jni/main.c b/ndk/samples/native-activity/jni/main.c
index 50f0a8c..f11c26e 100644
--- a/ndk/samples/native-activity/jni/main.c
+++ b/ndk/samples/native-activity/jni/main.c
@@ -193,8 +193,6 @@
                     if (!engine_do_main_cmd(&engine)) {
                         LOGI("Engine thread destroy requested!");
                         engine_term_display(&engine);
-                        android_app_destroy(state);
-                        // Can't touch android_app object after this.
                         return;
                     }
                     break;
diff --git a/ndk/samples/native-plasma/jni/Android.mk b/ndk/samples/native-plasma/jni/Android.mk
index e9dcaea..34e85a1 100644
--- a/ndk/samples/native-plasma/jni/Android.mk
+++ b/ndk/samples/native-plasma/jni/Android.mk
@@ -1,3 +1,17 @@
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
diff --git a/ndk/samples/native-plasma/jni/plasma.c b/ndk/samples/native-plasma/jni/plasma.c
index 3ccb605..964b892 100644
--- a/ndk/samples/native-plasma/jni/plasma.c
+++ b/ndk/samples/native-plasma/jni/plasma.c
@@ -480,8 +480,6 @@
                     if (!engine_do_main_cmd(&engine)) {
                         LOGI("Engine thread destroy requested!");
                         engine_term_display(&engine);
-                        android_app_destroy(state);
-                        // Can't touch android_app object after this.
                         return;
                     }
                     break;