Updated makefiles that also add static java library targets.
am: 495391aad8

Change-Id: Iab21a83fcd7a07ace057b7bd327b5356096654a4