Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev