Update makefiles to remove java-static libs.

Note base makefile isn't updated. This ensures
that changes upstream which depend on it can be
safely merged down.

Bug: 36376126
Test: pass
Change-Id: Id04b55098081af0862144e2546d3aa9a387f1513
3 files changed