tree edffaf0313f454aa4912aa77ad60b5e4719aa387
parent 19378800403cc0f0b66be22eb7285637a059ed6c
author Winson <chiuwinson@google.com> 1598468924 -0700
committer Winson <chiuwinson@google.com> 1598473951 -0700

Clean up trivial package refactor TODOs

Several TODOs were wrapped up as part of other work, but not cleaned up
properly.

Also fixes some toString methods which were incorrectly copy-pasted.

Bug: 160868823

Test: manual build, mostly non-functional changes

Change-Id: I577786f1ee178922a8d9a0d6c2708589b1b8dc37