Optimize imports

Run Android Studio Optimize Imports.  This seems to not have done much
of anything meaningful.
remove workspace.xml from VCS