Merge "Add Java 6's Scanner.reset and fix RuleBasedCollator's javadoc." into dalvik-dev