Merge "Fix incorrect Android-changed markers in String.java."