Merge "Check that the String class is not movable in String.equals intrinsics." am: 2860c19944
am: e2b13cb607

Change-Id: Id88beaf6b7b2454c54c22df28489cf3c2f8faced