Merge "Remove a use of String16::remove."