am 74e8693d: am ddc0a7bd: am 11fa4460: am 9da9a7cd: am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev

# Via Android Git Automerger (4) and others
* commit '74e8693d310d75e98c5cf62340612d474f6f197b':
  makefile changes for gcm javadocs