Refresh prebuilts/ndk/9 to r9d+

Change-Id: I307e1af61e046a2598ae0cc68862635e783a549f

8 files changed, 7 insertions, 3 deletions

diff --git a/9/platforms/android-3/arch-arm/usr/include/pthread.h b/9/platforms/android-3/arch-arm/usr/include/pthread.h
index 63ddb76..ef546e1 100644
--- a/9/platforms/android-3/arch-arm/usr/include/pthread.h
+++ b/9/platforms/android-3/arch-arm/usr/include/pthread.h
@@ -42,9 +42,13 @@ typedef struct
     int volatile value;
 } pthread_mutex_t;
 
-#define  PTHREAD_MUTEX_INITIALIZER             {0}
-#define  PTHREAD_RECURSIVE_MUTEX_INITIALIZER   {0x4000}
-#define  PTHREAD_ERRORCHECK_MUTEX_INITIALIZER  {0x8000}
+#define  __PTHREAD_MUTEX_INIT_VALUE            0
+#define  __PTHREAD_RECURSIVE_MUTEX_INIT_VALUE  0x4000
+#define  __PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE 0x8000
+
+#define  PTHREAD_MUTEX_INITIALIZER             {__PTHREAD_MUTEX_INIT_VALUE}
+#define  PTHREAD_RECURSIVE_MUTEX_INITIALIZER   {__PTHREAD_RECURSIVE_MUTEX_INIT_VALUE}
+#define  PTHREAD_ERRORCHECK_MUTEX_INITIALIZER  {__PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE}
 
 enum {
     PTHREAD_MUTEX_NORMAL = 0,
diff --git a/9/platforms/android-3/arch-arm/usr/lib/libc.so b/9/platforms/android-3/arch-arm/usr/lib/libc.so
index 4e26e45..663339e 100755
--- a/9/platforms/android-3/arch-arm/usr/lib/libc.so
+++ b/9/platforms/android-3/arch-arm/usr/lib/libc.so
diff --git a/9/platforms/android-3/arch-arm/usr/lib/libdl.so b/9/platforms/android-3/arch-arm/usr/lib/libdl.so
index cd26342..6e8effa 100755
--- a/9/platforms/android-3/arch-arm/usr/lib/libdl.so
+++ b/9/platforms/android-3/arch-arm/usr/lib/libdl.so
diff --git a/9/platforms/android-3/arch-arm/usr/lib/liblog.so b/9/platforms/android-3/arch-arm/usr/lib/liblog.so
index 169342e..4e3f025 100755
--- a/9/platforms/android-3/arch-arm/usr/lib/liblog.so
+++ b/9/platforms/android-3/arch-arm/usr/lib/liblog.so
diff --git a/9/platforms/android-3/arch-arm/usr/lib/libm.so b/9/platforms/android-3/arch-arm/usr/lib/libm.so
index aacc236..e205375 100755
--- a/9/platforms/android-3/arch-arm/usr/lib/libm.so
+++ b/9/platforms/android-3/arch-arm/usr/lib/libm.so
diff --git a/9/platforms/android-3/arch-arm/usr/lib/libstdc++.so b/9/platforms/android-3/arch-arm/usr/lib/libstdc++.so
index 7c39159..0899594 100755
--- a/9/platforms/android-3/arch-arm/usr/lib/libstdc++.so
+++ b/9/platforms/android-3/arch-arm/usr/lib/libstdc++.so
diff --git a/9/platforms/android-3/arch-arm/usr/lib/libthread_db.so b/9/platforms/android-3/arch-arm/usr/lib/libthread_db.so
index e3f459a..9a970d2 100755
--- a/9/platforms/android-3/arch-arm/usr/lib/libthread_db.so
+++ b/9/platforms/android-3/arch-arm/usr/lib/libthread_db.so
diff --git a/9/platforms/android-3/arch-arm/usr/lib/libz.so b/9/platforms/android-3/arch-arm/usr/lib/libz.so
index 24323e7..c1a8e29 100755
--- a/9/platforms/android-3/arch-arm/usr/lib/libz.so
+++ b/9/platforms/android-3/arch-arm/usr/lib/libz.so