Move lifecycle to the new proper directory structure

Bug: 134082137
Test: ./gradlew assembleDebug
Change-Id: I6716e857902423214d23302abe523ddf1ca3a792
diff --git a/settings.gradle b/settings.gradle
index 5733280..c6aa948 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -109,26 +109,26 @@
 includeProject(":lifecycle:integration-tests:incrementality", "lifecycle/integration-tests/incrementality")
 includeProject(":lifecycle:integration-tests:lifecycle-testapp", "lifecycle/integration-tests/testapp")
 includeProject(":lifecycle:integration-tests:lifecycle-testapp-kotlin", "lifecycle/integration-tests/kotlintestapp")
-includeProject(":lifecycle:lifecycle-common", "lifecycle/common")
+includeProject(":lifecycle:lifecycle-common", "lifecycle/lifecycle-common")
 // scheduled for removal, because it is part of common now. It was left only for docs
 // (till next release of alpha)
-includeProject(":lifecycle:lifecycle-common-java8", "lifecycle/common-java8")
-includeProject(":lifecycle:lifecycle-compiler", "lifecycle/compiler")
-includeProject(":lifecycle:lifecycle-extensions", "lifecycle/extensions")
-includeProject(":lifecycle:lifecycle-livedata-core", "lifecycle/livedata-core")
-includeProject(":lifecycle:lifecycle-livedata-core-ktx", "lifecycle/livedata-core/ktx")
-includeProject(":lifecycle:lifecycle-livedata", "lifecycle/livedata")
-includeProject(":lifecycle:lifecycle-livedata-ktx", "lifecycle/livedata/ktx")
-includeProject(":lifecycle:lifecycle-process", "lifecycle/process")
-includeProject(":lifecycle:lifecycle-reactivestreams", "lifecycle/reactivestreams")
-includeProject(":lifecycle:lifecycle-reactivestreams-ktx", "lifecycle/reactivestreams/ktx")
-includeProject(":lifecycle:lifecycle-runtime", "lifecycle/runtime")
-includeProject(":lifecycle:lifecycle-runtime-ktx", "lifecycle/runtime/ktx")
-includeProject(":lifecycle:lifecycle-runtime-ktx-lint", "lifecycle/runtime/ktx/lint")
-includeProject(":lifecycle:lifecycle-service", "lifecycle/service")
-includeProject(":lifecycle:lifecycle-viewmodel", "lifecycle/viewmodel")
-includeProject(":lifecycle:lifecycle-viewmodel-ktx", "lifecycle/viewmodel/ktx")
-includeProject(":lifecycle:lifecycle-viewmodel-savedstate","lifecycle/viewmodel-savedstate")
+includeProject(":lifecycle:lifecycle-common-java8", "lifecycle/lifecycle-common-java8")
+includeProject(":lifecycle:lifecycle-compiler", "lifecycle/lifecycle-compiler")
+includeProject(":lifecycle:lifecycle-extensions", "lifecycle/lifecycle-extensions")
+includeProject(":lifecycle:lifecycle-livedata-core", "lifecycle/lifecycle-livedata-core")
+includeProject(":lifecycle:lifecycle-livedata-core-ktx", "lifecycle/lifecycle-livedata-core-ktx")
+includeProject(":lifecycle:lifecycle-livedata", "lifecycle/lifecycle-livedata")
+includeProject(":lifecycle:lifecycle-livedata-ktx", "lifecycle/lifecycle-livedata-ktx")
+includeProject(":lifecycle:lifecycle-process", "lifecycle/lifecycle-process")
+includeProject(":lifecycle:lifecycle-reactivestreams", "lifecycle/lifecycle-reactivestreams")
+includeProject(":lifecycle:lifecycle-reactivestreams-ktx", "lifecycle/lifecycle-reactivestreams-ktx")
+includeProject(":lifecycle:lifecycle-runtime", "lifecycle/lifecycle-runtime")
+includeProject(":lifecycle:lifecycle-runtime-ktx", "lifecycle/lifecycle-runtime-ktx")
+includeProject(":lifecycle:lifecycle-runtime-ktx-lint", "lifecycle/lifecycle-runtime-ktx-lint")
+includeProject(":lifecycle:lifecycle-service", "lifecycle/lifecycle-service")
+includeProject(":lifecycle:lifecycle-viewmodel", "lifecycle/lifecycle-viewmodel")
+includeProject(":lifecycle:lifecycle-viewmodel-ktx", "lifecycle/lifecycle-viewmodel-ktx")
+includeProject(":lifecycle:lifecycle-viewmodel-savedstate","lifecycle/lifecycle-viewmodel-savedstate")
 includeProject(":loader:loader", "loader/loader")
 includeProject(":loader:loader-ktx", "loader/loader-ktx")
 includeProject(":localbroadcastmanager", "localbroadcastmanager")