Merge "Revert "makefile changes for gcm javadocs""