Merge "Revert "Fix String.equals() for moveable String.class.""
am: 4ac53a0e90

Change-Id: I2c42d9c1f29336ed301f8ba807eb9e5069f0d78e