Merge "java.text.RuleBasedCollator fixes." into dalvik-dev