Merge "Fix String.equals() for moveable String.class."