Cleaned up some simple hacking/pyflakes errors.

There are set of trivial changes that involved missing imports or unused
code. No functional changes should be evident.

Change-Id: If020e33674627845ea78192382bdf8977b442931
Merge "Cleaned up some simple hacking/pyflakes errors."