Added coverage target for Contacts and Calendar Provider

Change-Id: I0066451fa4deaee50f51d14c969580ed9626a4a4
diff --git a/testrunner/coverage_targets.xml b/testrunner/coverage_targets.xml
index 09da0c8..775f0e1 100644
--- a/testrunner/coverage_targets.xml
+++ b/testrunner/coverage_targets.xml
@@ -87,7 +87,7 @@
 
    <!-- content providers -->
     <coverage_target name="CalendarProvider"
-        build_path="packages/providers/calendar" type="APPS" />
+        build_path="packages/providers/CalendarProvider" type="APPS" />
     <coverage_target name="ContactsProvider"
         build_path="packages/providers/ContactsProvider" type="APPS" />
     <coverage_target name="DownloadProvider"
diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml
index c7c9d62..210c26f 100644
--- a/testrunner/test_defs.xml
+++ b/testrunner/test_defs.xml
@@ -391,19 +391,19 @@
     coverage_target="Browser" />
 
 <test name="calendar"
-    build_path="packages/apps/Calendar/tests"
+    build_path="packages/apps/Calendar"
     package="com.android.calendar.tests"
     coverage_target="Calendar"
     continuous="true" />
 
 <test name="calprov"
-    build_path="packages/providers/CalendarProvider/tests"
+    build_path="packages/providers/CalendarProvider"
     package="com.android.providers.calendar.tests"
     coverage_target="CalendarProvider"
     continuous="true" />
 
 <test name="contactsprov"
-    build_path="packages/providers/ContactsProvider/tests"
+    build_path="packages/providers/ContactsProvider"
     package="com.android.providers.contacts.tests"
     coverage_target="ContactsProvider"
     continuous="true" />