Revert "makefile changes for gcm javadocs"

Fixes known issue with failure of 'make sdk'
see: https://groups.google.com/forum/#!msg/android-building/fo--bOxDTPQ/NAmB3T1vEAIJ

This reverts commit 5f9922d7c3bce158e4c7a58929d4075e7c91e32e.
Merge branch 'jb-privacy' of https://github.com/nesl/platform_frameworks_base into HEAD