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

Change-Id: I104e350e444cf9bdd4f5f29dbc91501c162fc47b