base

Clean up a few minor issues

Make public some constants, remove unused imports.

See https://googleplex-android-review.git.corp.google.com/#/c/412885/
  for when these were introduced.

Change-Id: I90d0e33a411ebdd84c36e3d9afae70d2f2847538