Fix up symbols.xml.

These dependent changes removed things from public.xml that have
since been moved to symbols.xml, so we need to remove them again.

Bug: 6811501
Change-Id: I1b333a5d3174de9b90039dcebbadcef65e8ae7b8