Merge "Update makefiles to remove java-static libs." am: f1bef4107d
am: e6cbd2db20

Change-Id: Ia2ca949c398116e4dec09c9f5abe9faa2cb593b9