am e60b6023: Merge "makefile changes for gcm javadocs" into jb-mr1-dev

# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit 'e60b6023ae4fdea932d0effc553dddc38117d235':
  makefile changes for gcm javadocs