diff --git a/cmds/monkey/src/com/android/commands/monkey/Monkey.java b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
index 676043aa7..47c9cd8ea 100644
--- a/cmds/monkey/src/com/android/commands/monkey/Monkey.java
+++ b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
@@ -404,6 +404,9 @@ public class Monkey {
         // Set ro.monkey if it's not set yet.
         SystemProperties.set("ro.monkey", "true");
 
+        // Set the process name showing in "ps" or "top"
+        Process.setArgV0("com.android.commands.monkey");
+
         int resultCode = (new Monkey()).run(args);
         System.exit(resultCode);
     }
diff --git a/ndk/platforms/android-5/arch-arm/lib/libc.so b/ndk/platforms/android-5/arch-arm/lib/libc.so
new file mode 100644
index 000000000..2483bf7c7
Binary files /dev/null and b/ndk/platforms/android-5/arch-arm/lib/libc.so differ
diff --git a/ndk/platforms/android-8/arch-arm/lib/libc.so b/ndk/platforms/android-8/arch-arm/lib/libc.so
new file mode 100644
index 000000000..b965d04a4
Binary files /dev/null and b/ndk/platforms/android-8/arch-arm/lib/libc.so differ
diff --git a/ndk/platforms/android-8/arch-arm/lib/libdl.so b/ndk/platforms/android-8/arch-arm/lib/libdl.so
new file mode 100644
index 000000000..3319c4c6d
Binary files /dev/null and b/ndk/platforms/android-8/arch-arm/lib/libdl.so differ