Merge "Fix dalvik/tests/062-character-encodings." into dalvik-dev