Manual revert of "makefile changes for gcm javadocs"

* https://android.googlesource.com/platform/frameworks/base/+/d3b50de375fd251e$

These javadoc changes prohibit the compilation of sdk with 'make sdk'

Signed-off-by: Brandon McAnsh <brandonm@matricom.net>