Merge "Revert "Update makefiles for Java package path.""