Merge "Appease Doclava for ReferenceQueue.remove()"