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