am 2d130cee: am c5748148: Merge "Revert "makefile changes for gcm javadocs""

# By Robert Ly
# Via Android Git Automerger (1) and others
* commit '2d130ceede3dd3af8bcc1d154fb086188c075803':
  Revert "makefile changes for gcm javadocs"