Merge "Add the Java 6 java.text.spi and java.util.spi interfaces." into dalvik-dev