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