Orchestrator 1.6.1 Bug FixesRemove use of guava. Fixes https://github.com/android/android-test/issues/2422