Merge "Java 6 changed CollationKey from final to abstract." into dalvik-dev