Merge "Remove workaround to suppress reference errors." am: cf31db9702 am: 0dd0bcb5ee am: 1afe24fdc8

Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/1394987

Change-Id: I51446215f780c65dd56390373cb781676315bcb2