Use new definitions of ProviderStatus

And rebundle Contacts again.

Bug: 21090207
Change-Id: I7e93e36ad0c0d667ac56983c76acb1b97bd8755c
diff --git a/Android.mk b/Android.mk
index 10178fb..8f34bb9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,6 +36,8 @@
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
+LOCAL_SDK_VERSION := current
+
 include $(BUILD_PACKAGE)
 
 # Use the folloing include to make our test apk.