Rearranging the code structure to allow replacing state logic.

Change-Id: I6f83d0f77045ba189f02dd465bf70ffc2a239aa1
diff --git a/Android.mk b/Android.mk
index 282b878..13540f4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,7 +38,7 @@
 
 LOCAL_SRC_FILES := \
     $(call all-java-files-under, src) \
-    $(call all-java-files-under, src_config) \
+    $(call all-java-files-under, src_ui_overrides) \
     $(call all-java-files-under, src_flags) \
     $(call all-proto-files-under, protos) \
     $(call all-proto-files-under, proto_overrides)
@@ -83,7 +83,7 @@
 
 LOCAL_SRC_FILES := \
     $(call all-java-files-under, src) \
-    $(call all-java-files-under, src_config) \
+    $(call all-java-files-under, src_ui_overrides) \
     $(call all-java-files-under, go/src_flags) \
     $(call all-proto-files-under, protos) \
     $(call all-proto-files-under, proto_overrides)
@@ -134,9 +134,7 @@
 
 LOCAL_SRC_FILES := \
     $(call all-java-files-under, src) \
-    $(call all-java-files-under, src_config) \
     $(call all-java-files-under, quickstep/src) \
-    $(call all-java-files-under, quickstep/src_flags) \
     $(call all-proto-files-under, protos) \
     $(call all-proto-files-under, proto_overrides)