Updated makefiles that also add static java library targets. am: 495391aad8 am: a88908fc9f am: 8a54169407
am: b35730b0d0

Change-Id: I670ea37d0ad7a61bd7a39d70344a3734a498c41b