Merge "UiBench: bump tools ang gradle versions to newer ones"