Merge "Drop unused libcore.io imports." am: 58d5c1e938 am: 66234e3975
am: 523765542d

Change-Id: Ia091de2dc7b7ceb18d5c7f4646345caabdb7c0b2