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

Change-Id: Idb72304d11a7d2c42b81da30e9bb65eff38da4c8