Further cleanup, and move functionality into TestFixture objects

Change-Id: I62b514ae8fe10f720a60c681968efd2340616eba
diff --git a/tests/Android.mk b/tests/Android.mk
index f293b80..44575f5 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -20,11 +20,24 @@
 LOCAL_STATIC_JAVA_LIBRARIES := \
         android-ex-camera2 \
         guava \
-        mockito-target \
+        mockito-target
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := \
+        $(call all-java-files-under, src) \
+        $(call all-java-files-under, ../src)
 
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_RESOURCE_DIR := \
+    $(LOCAL_PATH)/res \
+    $(LOCAL_PATH)/../res
+
+LOCAL_JAVA_LIBRARIES := \
+        android.test.runner \
+        telephony-common
+
+LOCAL_AAPT_FLAGS := \
+    --auto-add-overlay \
+    --extra-packages com.android.server.telecom
+
 LOCAL_PACKAGE_NAME := TelecomTests
 LOCAL_CERTIFICATE := platform