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

# Via Android (Google) Code Review (2) and Android Git Automerger (2)
* commit '87db373a091b1126f2233e053f9549042564870a':
  Revert "makefile changes for gcm javadocs"