Merge "Enable Text core tests"

diff --cc core/tests/coretests/src/android/text/format/DateUtilsTest.java
index 20e19c9,798d268..79e2af3
--- 1/core/tests/coretests/src/android/text/format/DateUtilsTest.java
--- 2/core/tests/coretests/src/android/text/format/DateUtilsTest.java
+++ b/core/tests/coretests/src/android/text/format/DateUtilsTest.java
@@@ -16,10 -16,8 +16,10 @@@
  
  package android.text.format;
  
- import android.test.suitebuilder.annotation.SmallTest;
+ import android.support.test.filters.SmallTest;
  
 +import java.util.Locale;
 +
  import junit.framework.TestCase;
  
  public class DateUtilsTest extends TestCase {