Merge "Revert "Add the Okio library as a Macrobenchmark dependency.""