Merge branch 'unify-benchmarks-in-single-module' of https://github.com/android/performance-samples into unify-benchmarks-in-single-module

* 'unify-benchmarks-in-single-module' of https://github.com/android/performance-samples:

# Conflicts:
#	MacrobenchmarkSample/macrobenchmark/build.gradle.kts

Author: Murat Yener