Merge from savannah/emacs-30

aa1b55d Fix the Android build

Author: Po Lu

java/res/README renamed to java/README.res

@@ -1,4 +1,4 @@
 * The wrench icon that is superimposed on Emacs's own icon in
-  drawable/emacs_wrench.png was released into the Public Domain by the
+  res/drawable/emacs_wrench.png was released into the Public Domain by the
   Tango Desktop Project.
   <https://web.archive.org/web/20230207074050/https://tango.freedesktop.org/Tango_Desktop_Project>