am 9eb66b2d: Merge "Revert "makefile changes for gcm javadocs"" into jb-mr1-dev

# Via Android (Google) Code Review
* commit '9eb66b2db4724da7a2d6575fee29840004f1a5df':
  Revert "makefile changes for gcm javadocs"