Merge "Update makefiles after native handle in Java."