Revert "doclava fix"

This reverts commit f2056c0fe7fe237e5affa94c856f72f5127ea9ed.
This doesn't error out for me. It's identical to AOSP code.