Merge "Remove unused java.nio.charset.ModifiedUtf8"
am: 62b82cdbda

Change-Id: I3d922800b4ff44cdc4af750c355236fcf4a1c836