Merge "Remove unused java.nio.charset.ModifiedUtf8"