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

Change-Id: Ib8a5d956ce769779ee7b65f56be8b8db10d5008e