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

Change-Id: I684e0ad2f72a69d26da1416e11d73532e330b48b