Merge "Update makefiles for Java package path."