Minor tidying.
Restore AutoValue imports.
Merge pull request #194 from csmith/master

Minor tidying.