Merge "update-makefiles.sh: for partial Java pkgs"