Merge "Update makefiles to remove java-static libs."