Merge "Add guava-17.0 to the tools prebuilts" into studio-1.0-dev
automerge: b77d375

* commit 'b77d375c51c89a7a349d0454a019b0f62328283c':
  Add guava-17.0 to the tools prebuilts