Move benchmark -> benchmark-common

Test: ./gradlew benchmark:benchmark-common:cC

Change-Id: Icf964bbb8208ccf04000c15c7096bfd56a1b4155
diff --git a/settings.gradle b/settings.gradle
index f94aa3f9..214a69f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -55,7 +55,7 @@
 includeProject(":arch:core-runtime", "arch/core-runtime")
 includeProject(":asynclayoutinflater", "asynclayoutinflater")
 includeProject(":autofill", "autofill")
-includeProject(":benchmark", "benchmark")
+includeProject(":benchmark:benchmark-common", "benchmark/common")
 includeProject(":benchmark:benchmark-benchmark", "benchmark/benchmark")
 includeProject(":benchmark:benchmark-gradle-plugin", "benchmark/gradle-plugin")
 includeProject(":benchmark:integration-tests:startup-benchmark", "benchmark/integration-tests/startup-benchmark")