Remove dependencies on the custom-built Android JARs