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

Change-Id: Id1e57506c6b11a195eae72b6c58bd50e9884fb0e