Very minor code cleanups.
build.gradle: Increase build tools version again.
Remove unnused imports.