Cleanup related to files removed in Phone refactor.

Mostly just updating comments to remove names of old classes.

Bug: 25793157
Change-Id: I900b0ec0d137b2eb869a7ab40c264875366def26
2 files changed