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

Change-Id: I33fed4af5f23f1e793360d8e68e7ed789b224f43