Merge "Lose java.text tests to libcore."